summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--settings.py12
-rw-r--r--urls.py2
2 files changed, 4 insertions, 10 deletions
diff --git a/settings.py b/settings.py
index c48a847..b0839d6 100644
--- a/settings.py
+++ b/settings.py
@@ -10,7 +10,7 @@ DEBUG = False
TEMPLATE_DEBUG = DEBUG
# Django settings for chimere project.
-PROJECT_NAME = u'Chimère'
+PROJECT_NAME = 'Chimere'
ROOT_PATH = os.path.realpath(os.path.dirname(__file__)) + "/"
EMAIL_HOST = 'localhost'
@@ -26,8 +26,7 @@ JQUERY_CSS_URLS = ('/javascript/jquery-ui/css/smoothness/jquery-ui.css',
OSM_CSS_URLS = ["http://www.openlayers.org/api/theme/default/style.css"]
GPSBABEL = '/usr/bin/gpsbabel'
-GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an
- # error of 5 meters
+GPSBABEL_OPTIONS = 'simplify,crosstrack,error=0.005k' # simplify with an error of 5 meters
#GPSBABEL_OPTIONS = 'simplify,count=100'
## chimere specific ##
@@ -169,10 +168,6 @@ INSTALLED_APPS = [
'django.contrib.sites',
'django.contrib.gis',
'django.contrib.staticfiles',
- 'south',
- 'chimere',
- # activate it if you want to use old migration scripts
- #'chimere.scripts',
]
# celery
@@ -190,8 +185,7 @@ except ImportError:
INSTALLED_APPS += [
'south',
'chimere',
- # activate it if you want to use old migration scripts
- #'chimere.scripts',
+# 'chimere.scripts', # activate it if you want to use old migration scripts
]
LOGGING = {'version': 1,
diff --git a/urls.py b/urls.py
index e37ae53..fff1366 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2013 Etienne Loks <etienne.loks_AT_peacefrogsDOTnet>
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as