X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=709f78cf248708646b86c8bae907360722184e54;hb=64f81bc31699ed239e4becec1cfa7ebc0bef2b5a;hp=fb51034e28110d62921deddf00cbacaf6eb85358;hpb=0faeabefa7faedb3a6a3675a5e49e947554adae9;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index fb51034e..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,9 +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/*
+
+# Test-generated files
+admin-export.json
+specialexport.json