summaryrefslogtreecommitdiffstats
path: root/askbot/setup_templates
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-06 11:37:33 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-09-06 11:37:33 -0400
commitcc3ebc871f8da4329aad5db65e960b052e8f8834 (patch)
tree450ce91dcc2de37b9837de6e4db94965f77d07dc /askbot/setup_templates
parentc46cbfb2e5bf1d28a5fbfbcf156e5d3509241316 (diff)
parent996507782f455c17afcf68667ad83c963a9179c7 (diff)
downloadaskbot-cc3ebc871f8da4329aad5db65e960b052e8f8834.tar.gz
askbot-cc3ebc871f8da4329aad5db65e960b052e8f8834.tar.bz2
askbot-cc3ebc871f8da4329aad5db65e960b052e8f8834.zip
merged with adolfos master branch
Diffstat (limited to 'askbot/setup_templates')
-rw-r--r--askbot/setup_templates/settings.py1
-rw-r--r--askbot/setup_templates/settings.py.mustache1
-rw-r--r--askbot/setup_templates/tinymce_sample_config.py1
3 files changed, 3 insertions, 0 deletions
diff --git a/askbot/setup_templates/settings.py b/askbot/setup_templates/settings.py
index d0cb6e2d..0af52df1 100644
--- a/askbot/setup_templates/settings.py
+++ b/askbot/setup_templates/settings.py
@@ -150,6 +150,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
INSTALLED_APPS = (
+ 'longerusername',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
diff --git a/askbot/setup_templates/settings.py.mustache b/askbot/setup_templates/settings.py.mustache
index e9d9245e..82ff1d92 100644
--- a/askbot/setup_templates/settings.py.mustache
+++ b/askbot/setup_templates/settings.py.mustache
@@ -149,6 +149,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
INSTALLED_APPS = (
+ 'longerusername',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
diff --git a/askbot/setup_templates/tinymce_sample_config.py b/askbot/setup_templates/tinymce_sample_config.py
index d3ac1d12..c75170b0 100644
--- a/askbot/setup_templates/tinymce_sample_config.py
+++ b/askbot/setup_templates/tinymce_sample_config.py
@@ -21,5 +21,6 @@ TINYMCE_DEFAULT_CONFIG = {
'theme_advanced_resizing': True,
'theme_advanced_resize_horizontal': False,
'theme_advanced_statusbar_location': 'bottom',
+ 'width': '723',
'height': '250'
}