Merge branch 'hotfix/1.0.4'

[galette.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d09259d2191647108c87d95dfd947bb98c3ce40a..5b4c30a0d3c8518ec5eab4f2ff2837dcbff963cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@
 .settings/
 nbproject
 
+# Mac OS files
+.DS_Store
+
 # /galette/
 /galette/build-stamp
 /galette/configure-stamp
@@ -9,6 +12,7 @@ nbproject
 /galette/data/cache/*
 !/galette/data/cache/readme.txt
 !/galette/data/cache/.htaccess
+tempcache/
 
 .vimfiles*
 .exvim*
@@ -71,13 +75,18 @@ tests/coverage/
 tests/mageekguy.atoum.phar
 
 # Bundled libs
-galette/includes/tcpdf_*
-galette/includes/Zend*
-galette/includes/Analog*
-galette/password_compat*
+galette/vendor/
+node_modules/
+galette/webroot/assets/*
+galette/webroot/themes/*
+
+# Semantic UI
+semantic
+!ui/semantic
 
 # API documentation
 apidocs/
+build/
 
 #Backup files
 *~