Merge branch 'v2.0'

Conflicts:
	settings.py

7 files changed, 13 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2aac5f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+media/*
+local_settings.py
+static/*
+*.pyc
diff --git a/media/icons/marker.png b/media/icons/marker.png
deleted file mode 100755
index ccd1913..0000000
--- a/media/icons/marker.png
+++ /dev/null
diff --git a/media/icons/readme b/media/icons/readme
deleted file mode 100644
index 560759a..0000000
--- a/media/icons/readme
+++ /dev/null
@@ -1 +0,0 @@
-Icons are stored here
diff --git a/media/pictures/readme b/media/pictures/readme
deleted file mode 100644
index c0d20b7..0000000
--- a/media/pictures/readme
+++ /dev/null
@@ -1 +0,0 @@
-Pictures are stored here
diff --git a/media/route_files/readme b/media/route_files/readme
deleted file mode 100644
index 90d72ab..0000000
--- a/media/route_files/readme
+++ /dev/null
@@ -1 +0,0 @@
-Route files are stored here
diff --git a/project_static/.project_static b/project_static/.project_static
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/project_static/.project_static
diff --git a/settings.py b/settings.py
index 0918e93..677cf83 100644
--- a/settings.py
+++ b/settings.py
@@ -4,7 +4,7 @@
 # Don't edit this file:
 # overload all theses settings in your local_settings.py file
 
-import os
+import os, sys
 _ = lambda s: s
 
 DEBUG = False
@@ -19,6 +19,8 @@ CONTACT_EMAIL = ''
 STATIC_URL = '/static/'
 STATIC_ROOT = ROOT_PATH + 'static/'
 
+STATICFILES_DIRS = (ROOT_PATH + 'project_static',)
+
 TINYMCE_URL = '/tinymce/'
 JQUERY_JS_URLS = ('/javascript/jquery/jquery.js',
                   '/javascript/jquery-ui/jquery-ui.js',)
@@ -112,6 +114,9 @@ CHIMERE_THUMBS_SCALE_WIDTH=None
 
 CHIMERE_CSV_ENCODING = 'ISO-8859-1'
 
+# generic contact email
+CONTACT_EMAIL = ''
+
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
@@ -129,6 +134,9 @@ DATABASES = {
     },
 }
 
+if 'test' in sys.argv:
+    SOUTH_TESTS_MIGRATE = False
+
 # Local time zone for this installation. Choices can be found here:
 # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
 # although not all variations may be possible on all operating systems.