Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'release/0.6.1'

  • Loading branch information...
commit 7964f756f977fd1674fe7bb443ff85aab2e617e4 2 parents 43bb77e + f59718f
@klen authored
View
4 base/config/core.py
@@ -1,4 +1,4 @@
-" Core configuration settings. "
+" Immutable basic settings. "
from base.config import op, ROOTDIR
@@ -24,4 +24,4 @@
MAIL_USE_SSL = True
MAIL_USERNAME = None
MAIL_PASSWORD = None
-DEFAULT_MAIL_SENDER = MAIL_USERNAME and ('Admin <%s>' % MAIL_USERNAME) or None
+DEFAULT_MAIL_SENDER = None
View
1  base/config/develop.py
@@ -3,6 +3,7 @@
from .production import *
+MODE = 'develop'
DEBUG = True
DEBUG_TB_INTERCEPT_REDIRECTS = False
SQLALCHEMY_ECHO = True
View
1  base/config/production.py
@@ -4,6 +4,7 @@
from os import path as op
+MODE = 'production'
SECRET_KEY = 'SecretKeyForSessionSigning'
ADMINS = MAIL_USERNAME and [MAIL_USERNAME] or None
View
1  base/config/test.py
@@ -3,6 +3,7 @@
from .production import *
+MODE = 'test'
TESTING = True
SQLALCHEMY_DATABASE_URI = 'sqlite:///:memory:'
CSRF_ENABLED = False
View
2  base/core/templates/core/base.html
@@ -46,4 +46,6 @@
{% if config.get('FOUNDATION_METRIKA') %} {% include "core/blocks/metrika.html" %} {% endif %}
{% if config.get('FOUNDATION_ANALYTICS') %} {% include "core/blocks/analytics.html" %} {% endif %}
+ <!-- {{ config.get('MODE', 'unknown' ) }}:{{ config.get('DEBUG', False) }} -->
+
{% endblock %}
Please sign in to comment.
Something went wrong with that request. Please try again.