Merge remote-tracking branch 'zawadzki/new-design'

[wolnelektury.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 38a691b..99c0898 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,26 @@
 localsettings.py
 dev.sqlite
 *.db
+*.db-journal
 *~
 *.orig
+*.log
+.sass-cache
+*.css.map
+
+# Compress output
+/var
+
+# SCSS output
+src/wolnelektury/static/scss/*.css
 
 # Python garbage
 *.pyc
 .coverage
+coverage.xml
 pip-log.txt
+nosetests.xml
+/htmlcov
 
 # Mac OS X garbage
 .DS_Store
@@ -21,3 +34,16 @@ thumbs.db
 .pydevproject
 .tmp_*
 
+# PyCharm
+.idea
+
+# Emacs
+\#*\#
+.\#*
+
+# Tags file
+TAGS
+
+doc/_build
+reports
+