summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/base_urls.py1
-rw-r--r--config/requirements.txt13
-rw-r--r--config/settings/settings.py2
-rw-r--r--config/settings/settings_dev.py2
4 files changed, 9 insertions, 9 deletions
diff --git a/config/base_urls.py b/config/base_urls.py
index b0959ff..e1c6ca5 100644
--- a/config/base_urls.py
+++ b/config/base_urls.py
@@ -39,7 +39,6 @@ urlpatterns += patterns('',
urlpatterns += patterns('',
(r'^admin/build/.*', 'builder.views.do_build'),
(r'^admin/', include(admin.site.urls),),
- (r'^grappelli/', include('grappelli.urls')),
#(r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}),
(r'^robots.txt$', TemplateView.as_view(template_name='archives/robots.html')),
(r'^googleb11655cd59dacf3c.html$', TemplateView.as_view(template_name='static/gverify.html')),
diff --git a/config/requirements.txt b/config/requirements.txt
index cd13a58..88b3bea 100644
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -1,10 +1,15 @@
-Django==1.4.1
+Django==1.5c1
+Markdown==2.2.0
PIL==1.1.7
+PyGithub==1.11.0
+distribute==0.6.31
django-extensions==0.9
-django-filebrowser==3.5.0
-django-grappelli==2.4.2
-django-pipeline==1.2.17
+httplib2==0.7.7
+jsmin==2.0.2
psycopg2==2.4.5
+python-dateutil==2.1
+requests==0.14.0
+six==1.2.0
wsgiref==0.1.2
yolk==0.4.3
yuicompressor==2.4.7
diff --git a/config/settings/settings.py b/config/settings/settings.py
index b8560fb..4030fc5 100644
--- a/config/settings/settings.py
+++ b/config/settings/settings.py
@@ -124,7 +124,6 @@ TEMPLATE_DIRS = (
INSTALLED_APPS = (
- 'grappelli',
'django.contrib.auth',
'django.contrib.staticfiles',
'django.contrib.contenttypes',
@@ -133,7 +132,6 @@ INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.sitemaps',
'django.contrib.gis',
- 'filebrowser',
'locations',
'blog',
'photos',
diff --git a/config/settings/settings_dev.py b/config/settings/settings_dev.py
index a6be304..010ac31 100644
--- a/config/settings/settings_dev.py
+++ b/config/settings/settings_dev.py
@@ -125,7 +125,6 @@ TEMPLATE_DIRS = (
INSTALLED_APPS = (
- 'grappelli',
'django.contrib.auth',
'django.contrib.staticfiles',
'django.contrib.contenttypes',
@@ -134,7 +133,6 @@ INSTALLED_APPS = (
'django.contrib.admin',
'django.contrib.sitemaps',
'django.contrib.gis',
- 'filebrowser',
'locations',
'blog',
'photos',