summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorsng <sng@snglinux.(none)>2013-05-28 19:58:08 -0400
committersng <sng@snglinux.(none)>2013-05-28 19:58:08 -0400
commit38b863f790eecdc328bd43589bca3630e46be73e (patch)
tree85e8d63b67cf9b2de9fa7915747d90a805c7e808 /config
parentc699779d07ef9cdb6e520836a7bde4d8418dcec8 (diff)
bug fixes for links in main menu
Diffstat (limited to 'config')
-rw-r--r--config/requirements.txt3
-rw-r--r--config/settings/settings.py1
-rw-r--r--config/settings/settings_dev.py7
3 files changed, 6 insertions, 5 deletions
diff --git a/config/requirements.txt b/config/requirements.txt
index 88b3bea..043e5e5 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -1,7 +1,6 @@
-Django==1.5c1
+Django==1.5.1
Markdown==2.2.0
PIL==1.1.7
-PyGithub==1.11.0
distribute==0.6.31
django-extensions==0.9
httplib2==0.7.7
diff --git a/config/settings/settings.py b/config/settings/settings.py
index 47b5562..a2c37d3 100644
--- a/config/settings/settings.py
+++ b/config/settings/settings.py
@@ -142,6 +142,7 @@ INSTALLED_APPS = (
'projects',
'guide',
'pages'
+ 'birds'
)
diff --git a/config/settings/settings_dev.py b/config/settings/settings_dev.py
index 010ac31..1f2e4e9 100644
--- a/config/settings/settings_dev.py
+++ b/config/settings/settings_dev.py
@@ -19,6 +19,7 @@ DATABASES = {
'ENGINE': 'django.contrib.gis.db.backends.postgis',
'USER': 'luxagraf',
'PASSWORD': 'translinguis',
+ 'HOST': 'localhost',
}
}
@@ -29,7 +30,7 @@ SITE_URL = 'http://luxagraf.net/'
GRAPPELLI_ADMIN_TITLE = 'Luxagraf Admin'
USE_I18N = False
USE_L10N = True
-USE_TZ = True
+USE_TZ = False
#API key for Google Maps in Admin
MAP_API = "google"
@@ -142,8 +143,8 @@ INSTALLED_APPS = (
'templatetags',
'projects',
'guide',
- 'pages'
-
+ 'pages',
+ 'birds'
)
DEVELOPMENT = True
if DEVELOPMENT: