X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=709f78cf248708646b86c8bae907360722184e54;hb=f92fcb53ca78cc8822962e676b0db117e1a08aa5;hp=f596c7b8fb9d6562ec0baa1a1b76f580308451ec;hpb=2f9927404d620f719d4b30d9205ff43c0238e6a1;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index f596c7b8..709f78cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,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
@@ -32,7 +37,6 @@
 /composer.phar
 
 # Data for wallabag
-data/assets/*
 data/db/wallabag*.sqlite
 
 # Docker container logs and data
@@ -41,3 +45,14 @@ 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