diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-04-30 09:21:09 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-04-30 09:21:09 -0600 |
| commit | e952de19168db60c071dde0263ff9105c85a1cf4 (patch) | |
| tree | c751a012e3f1d43b98689301dfd7b90e450eaedd | |
| parent | d0e4771699e5f87f275c4493c2f6f1241845dcd9 (diff) | |
| parent | f4a72b0cd2bd5eacdf4e0b466d7761f8d1a06ee7 (diff) | |
| download | askbot-e952de19168db60c071dde0263ff9105c85a1cf4.tar.gz askbot-e952de19168db60c071dde0263ff9105c85a1cf4.tar.bz2 askbot-e952de19168db60c071dde0263ff9105c85a1cf4.zip | |
Merge branch 'master' of github.com:ASKBOT/askbot-devel
| -rw-r--r-- | askbot/setup_templates/settings.py | 2 | ||||
| -rw-r--r-- | askbot/setup_templates/settings.py.mustache | 2 | ||||
| -rw-r--r-- | askbot/skins/default/templates/badges.html | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py index 3ec209df..b326ea85 100644 --- a/askbot/setup_templates/settings.py +++ b/askbot/setup_templates/settings.py @@ -184,7 +184,7 @@ CACHE_TIMEOUT = 6000 CACHE_PREFIX = 'askbot' #make this unique CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True #If you use memcache you may want to uncomment the following line to enable memcached based sessions -#SESSION_ENGINE = 'django.contrib.sessions.backends.cache_db' +#SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db' AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache index 43f2f47b..eb1cb1c1 100644 --- a/askbot/setup_templates/settings.py.mustache +++ b/askbot/setup_templates/settings.py.mustache @@ -183,7 +183,7 @@ CACHE_TIMEOUT = 6000 CACHE_PREFIX = 'askbot' #make this unique CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True #If you use memcache you may want to uncomment the following line to enable memcached based sessions -#SESSION_ENGINE = 'django.contrib.sessions.backends.cache_db' +#SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db' AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html index 62627b05..668de4f8 100644 --- a/askbot/skins/default/templates/badges.html +++ b/askbot/skins/default/templates/badges.html @@ -7,7 +7,7 @@ {% trans %}Community gives you awards for your questions, answers and votes.{% endtrans %}<br/> {% trans %}Below is the list of available badges and number of times each type of badge has been awarded. Have ideas about fun -badges? Please, give us your <a href='%(feedback_faq_url)s'>feedback</a> +badges? Please, give us your <a href='{{feedback_faq_url}}'>feedback</a> {% endtrans %} </p> <div id="medalList"> |