remotes/origin/artem
spacenergy 11 years ago
parent 031b85bdbd
commit 6f1550bc50
  1. 7
      batiskaf/settings.py
  2. 11
      batiskaf/templates/jinja2/base.jinja
  3. 31
      requirements.txt

@ -248,8 +248,11 @@ CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
CELERY_SEND_TASK_ERROR_EMAILS = True CELERY_SEND_TASK_ERROR_EMAILS = True
if DEBUG: if DEBUG:
EMAIL_BACKEND = 'main.backends.email_backends.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
EMAIL_FILE_PATH = 'tmp/eml/' # EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
# EMAIL_FILE_PATH = '/tmp/app-messages'
# EMAIL_BACKEND = 'main.backends.email_backends.EmailBackend'
# EMAIL_FILE_PATH = 'tmp/eml/'
GRAPPELLI_ADMIN_TITLE = 'Батискаф' GRAPPELLI_ADMIN_TITLE = 'Батискаф'
GRAPPELLI_SWITCH_USER = True GRAPPELLI_SWITCH_USER = True

@ -316,6 +316,17 @@
border=0 height=31 width=88 border=0 height=31 width=88
alt='Дайвинг - рейтинг DIVEtop'></a> alt='Дайвинг - рейтинг DIVEtop'></a>
<!--/COUNTER--> <!--/COUNTER-->
<!--LiveInternet counter--><script type="text/javascript"><!--
document.write("<a href='//www.liveinternet.ru/click' "+
"target=_blank><img src='//counter.yadro.ru/hit?t16.6;r"+
escape(document.referrer)+((typeof(screen)=="undefined")?"":
";s"+screen.width+"*"+screen.height+"*"+(screen.colorDepth?
screen.colorDepth:screen.pixelDepth))+";u"+escape(document.URL)+
";"+Math.random()+
"' alt='' title='LiveInternet: показано число просмотров за 24"+
" часа, посетителей за 24 часа и за сегодня' "+
"border='0' width='88' height='31'><\/a>")
//--></script><!--/LiveInternet-->
</div> </div>
</div> </div>

@ -0,0 +1,31 @@
cffi==1.1.2
cryptography==0.9.3
Django==1.8.3
django-extensions==1.5.5
django-jinja==1.4.1
django-jinja-bootstrap-form==4.0.3
djangorestframework==3.1.3
docopt==0.6.2
easy-thumbnails==2.2
idna==2.0
jedi==0.9.0
Jinja2==2.8
kkb==0.6
MarkupSafe==0.23
pbr==1.3.0
Pillow==2.9.0
prompt-toolkit==0.42
psycopg2==2.6.1
ptpython==0.16
pyasn1==0.1.8
pycparser==2.14
Pygments==2.0.2
pyOpenSSL==0.15.1
requests==2.7.0
six==1.9.0
stevedore==1.6.0
virtualenv==13.1.0
virtualenv-clone==0.2.6
virtualenvwrapper==4.6.0
wcwidth==0.1.4
wheel==0.24.0
Loading…
Cancel
Save