diff options
| author | Alvin Li <liweitianux@gmail.com> | 2013-10-04 23:56:35 +0800 |
|---|---|---|
| committer | Alvin Li <liweitianux@gmail.com> | 2013-10-04 23:56:35 +0800 |
| commit | f552b41f4b337e6844f71c29ff177915abbfa417 (patch) | |
| tree | 7ade59430c6767a5b379c7a8cb95af3387622b13 /97suifangqa/settings.py | |
| parent | 816730ff659e1338ab3e37a1d45ea337e337b3dd (diff) | |
| download | 97dev-f552b41f4b337e6844f71c29ff177915abbfa417.tar.bz2 | |
* indicator/static/javascripts/card_chart.js:
improved the display position of 'detail_card_info'
* indicator/templates/indicator/SheetDefault.html:
destroy 'qtip' when close card
* added new app 'apps/sfaccount'
* implemented 'signup' and 'activate' functions
* implemented async sending activation mail
(using 'django-celery' and 'redis')
* moved 'registration/*' templates to 'sfaccount/templates'
* implemented 'password_change' function:
o password_change
o password_change_done
* implemented 'password_reset' function
o password_reset
o password_reset_done
o password_reset_confirm
o password_reset_complete
o re-write 'sfaccount.fomrs.SFPasswordResetForm'
o re-write 'sfaccount.views.password_reset_view'
* improved 'sfaccount.functional' send mail functions
o to send 'multipart' mail
* added 'README.txt'
* added app 'apps/recommend':
for comparing with the SCI papers and then recommending
most related papers for user.
Diffstat (limited to '97suifangqa/settings.py')
| -rw-r--r-- | 97suifangqa/settings.py | 35 |
1 files changed, 32 insertions, 3 deletions
diff --git a/97suifangqa/settings.py b/97suifangqa/settings.py index 9dd3fc9..3245266 100644 --- a/97suifangqa/settings.py +++ b/97suifangqa/settings.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -import os,sys +import os, sys DEBUG = True @@ -144,6 +144,8 @@ INSTALLED_APPS = ( # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', 'haystack', + 'djcelery', + 'sfaccount', 'profile', 'location', 'indicator', @@ -152,15 +154,40 @@ INSTALLED_APPS = ( 'subjects', 'sciblog', 'info', + 'recommend', #'97suifangqa', ) LOGIN_REDIRECT_URL = '/blog/index' -# django-haystack settings +## +ACCOUNT_ACTIVATION_DAYS = 3 + +## avatar +AVATAR_DIR = os.path.join(PROJECT_ROOT, 'uploads/avatars') + +## socialoauth settings +USING_SOCIAL_LOGIN = True +try: + from socialoauth_settings import * +except ImportError: + pass + +## email +BROKER_URL = 'redis://127.0.0.1:6379/0' +CELERY_RESULT_BACKEND = 'redis://127.0.0.1:6379/0' + +import djcelery +djcelery.setup_loader() + +## mail server settings +from mail_settings import * + + +## django-haystack settings from haystack_settings import * -# auto reload when deployed under uWSGI +## auto reload when deployed under uWSGI try: import uwsgi from uwsgidecorators import timer @@ -172,3 +199,5 @@ try: uwsgi.reload() except: pass + + |