X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=736ef852982243e6f6b31275d1ec6682cb79fe61;hb=refs%2Fheads%2Frss2atom;hp=f596c7b8fb9d6562ec0baa1a1b76f580308451ec;hpb=317fc6e684356b645ea1327c2631c7d5fc193ddd;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index f596c7b8..736ef852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /bin/*
 !/bin/console
 !/bin/symfony_requirements
+.php_cs.cache
 
 # Parameters
 /app/config/parameters.yml
@@ -21,8 +22,13 @@
 /vendor/
 
 # Assets and user uploads
-/web/bundles/
-/web/uploads/
+web/uploads/
+!web/bundles
+web/bundles/*
+!web/bundles/wallabagcore
+/web/assets/images/*
+!web/assets/images/.gitkeep
+web/bundles/wallabagcore/*.dev.js
 
 # Build
 /app/build
@@ -32,7 +38,6 @@
 /composer.phar
 
 # Data for wallabag
-data/assets/*
 data/db/wallabag*.sqlite
 
 # Docker container logs and data
@@ -41,3 +46,15 @@ docker/data/
 
 # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
 composer.lock
+
+# assets stuff
+node_modules/
+bin
+app/Resources/build/
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*
+
+# Test-generated files
+admin-export.json
+specialexport.json
+/data/site-credentials-secret-key.txt