Merge branch 'master' into lucene_memory

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1152ea7..cef8774 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,26 @@
 localsettings.py
 dev.sqlite
-dev.db
+*.db
+*.db-journal
+*~
+*.orig
+*.log
+
+# Compress output
+/wolnelektury/static/css/all.min*.css
+/wolnelektury/static/js/all*.min.js
+/wolnelektury/static/css/book.min*.css
+/wolnelektury/static/js/book*.min.js
+/wolnelektury/static/js/jquery.min.js
+/wolnelektury/static/css/ie.min*.css
+/wolnelektury/static/css/screen.min*.css
+/wolnelektury/static/js/base*.min.js
 
 # Python garbage
 *.pyc
 .coverage
 pip-log.txt
+nosetests.xml
 
 # Mac OS X garbage
 .DS_Store
@@ -17,3 +32,10 @@ thumbs.db
 .project
 .settings
 .pydevproject
+.tmp_*
+
+# Tags file
+TAGS
+
+media
+search_index