Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge from userprofile_pics

  • Loading branch information...
commit cbb772d5e7da8b7237d565bb2caffa19108544cf 1 parent 85b4bbd
@readevalprint readevalprint authored
View
1  .gitignore
@@ -24,3 +24,4 @@ docs/_build
settings/*local.py
directory
media/uploads
+media/cache
View
2  .gitmodules
@@ -1,6 +1,8 @@
[submodule "vendor"]
+ ignore = dirty
path = vendor
url = git://github.com/mozilla/mozillians-lib.git
[submodule "media/js/libs/tag-it"]
+ ignore = dirty
path = media/js/libs/tag-it
url = git://github.com/aehlke/tag-it.git
View
1  requirements/compiled.txt
@@ -8,3 +8,4 @@ py-bcrypt==0.2
# Images
PIL
+sorl-thumbnail
View
4 requirements/dev.txt
@@ -15,3 +15,7 @@ pyquery
# L10n
translate-toolkit==1.8.0
+
+# Debug tools
+django-extensions
+Werkzeug
View
6 requirements/prod.txt
@@ -1,7 +1,5 @@
--r ../vendor/src/funfactory/funfactory/requirements/prod.txt
-
# Django stuff
--e git://github.com/django/django@36c82ac8#egg=django
+-e git://github.com/django/django@1.3.X#egg=django
# Django Extensions
-e git://github.com/mozilla/happyforms.git#egg=happyforms
@@ -31,7 +29,7 @@ Babel>=0.9.4
python-memcached==1.45
# Multidb
--e https://github.com/jbalogh/django-multidb-router#egg=multidb
+-e git://github.com/jbalogh/django-multidb-router.git#egg=multidb
# ElasticUtils
-e git://github.com/davedash/elasticutils#egg=elasticutils
View
11 settings/default.py
@@ -112,6 +112,7 @@
'phonebook',
'groups',
'taskboard',
+ 'common',
# 'locations',
'csp',
@@ -119,6 +120,7 @@
'tower',
'cronjobs',
'elasticutils',
+ 'sorl.thumbnail',
'django.contrib.admin',
'django.contrib.auth',
@@ -181,5 +183,10 @@
# Use this to reserve the URL namespace
USERNAME_BLACKLIST = ('save', 'tofumatt', 'lonelyvegan', 'tag', 'group',
- 'groups', 'tags', 'media', 'username', 'register',
- 'new', 'delete', 'help', 'photo', 'img', 'src', 'files')
+ 'about', 'groups', 'tags', 'media', 'username',
+ 'register', 'new', 'delete', 'help', 'photo', 'img',
+ 'src', 'files')
+
+# Sorl settings
+THUMBNAIL_DUMMY = True
+THUMBNAIL_PREFIX = 'cache/'
2  vendor
@@ -1 +1 @@
-Subproject commit 13e24ff5d30c9ffc16624673a85a5a2ee220dce6
+Subproject commit a5fdf941bc8d4c99ab9939496b5d51fb5ce486bd
Please sign in to comment.
Something went wrong with that request. Please try again.