X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=8fd762fa8abccbc5bafac85d246e88de829dc483;hb=6b1b148d655eec4411e13a90a0bd050b923e3ef9;hp=02e921f8d0accce39ad7aa53e1882a7ec588b3b0;hpb=85ad629a3ca209907effd75f5fd7f384f42361bc;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 02e921f8..8fd762fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
 /var/sessions/*
 !var/sessions/.gitkeep
 !var/SymfonyRequirements.php
+/bin/*
+!/bin/console
+!/bin/symfony_requirements
 
 # Parameters
 /app/config/parameters.yml
@@ -18,8 +21,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
@@ -29,7 +37,6 @@
 /composer.phar
 
 # Data for wallabag
-data/assets/*
 data/db/wallabag*.sqlite
 
 # Docker container logs and data
@@ -38,3 +45,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