X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=709f78cf248708646b86c8bae907360722184e54;hb=4ab0d25f652bdfe184046be6d50afd594709e1a9;hp=9e793a54f1455b3ba4efdf2a2073ed6c879a4840;hpb=c146f6940a176142084b4fc3c610d13aca60d90e;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 9e793a54..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
@@ -43,13 +47,12 @@ docker/data/
 composer.lock
 
 # assets stuff
-/node_modules/
-!app/Resources/static/lib
-app/Resources/static/lib/*
-/bin
+node_modules/
+bin
+app/Resources/build/
 !/src/Wallabag/CoreBundle/Resources/public
 /src/Wallabag/CoreBundle/Resources/public/*
 
-# PHPStorm
-.idea/
-
+# Test-generated files
+admin-export.json
+specialexport.json