Merge branch 'master' of github.com:ASKBOT/askbot-devel

11 files changed, 20 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index 586c4c8a..07a3f84f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ lint
 env
 /static
 django
+lamson
 django/*
 nbproject
 pip-log.txt
diff --git a/MANIFEST.in b/MANIFEST.in
index 72c4fd65..cce28976 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -11,6 +11,9 @@ recursive-exclude .git
 prune dist
 prune tmp
 prune build
+prune static
+prune django
+prune lamson
 exclude db
 exclude lint
 exclude settings.py
diff --git a/askbot/__init__.py b/askbot/__init__.py
index 7b8a7280..5a8afcaa 100644
--- a/askbot/__init__.py
+++ b/askbot/__init__.py
@@ -9,13 +9,13 @@ import smtplib
 import sys
 import logging
 
-VERSION = (0, 7, 39)
+VERSION = (0, 7, 40)
 
 #keys are module names used by python imports,
 #values - the package qualifier to use for pip
 REQUIREMENTS = {
     'akismet': 'akismet',
-    'django': 'django>=1.1.2',
+    'django': 'django==1.3.1',
     'jinja2': 'Jinja2',
     'coffin': 'Coffin>=0.3',
     'south': 'South>=0.7.1',
diff --git a/askbot/conf/license.py b/askbot/conf/license.py
index faf50697..453213c4 100644
--- a/askbot/conf/license.py
+++ b/askbot/conf/license.py
@@ -10,7 +10,7 @@ from django.conf import settings as django_settings
 
 LICENSE_SETTINGS = livesettings.ConfigurationGroup(
                         'LICENSE_SETTINGS',
-                        _('Content LicensContent License'),
+                        _('Content License'),
                         super_group = CONTENT_AND_UI
                     )
 
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index a1a2eaf7..1055caf7 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -1,8 +1,8 @@
 Changes in Askbot
 =================
 
-Development version (not released yet)
---------------------------------------
+0.7.40 (March 29, 2012)
+-----------------------
 * New data models!!! (`Tomasz Zieliński <http://pyconsultant.eu>`_)
 * Made email recovery link work when askbot is deployed on subdirectory (Evgeny)
 * Added tests for the CSRF_COOKIE_DOMAIN setting in the startup_procedures (Evgeny)
@@ -25,6 +25,8 @@ Development version (not released yet)
 * Added "reply by email" function (`Vasil Vangelovski <http://www.atomidata.com>`_)
 * Enabled "ask by email" via Lamson (Evgeny)
 * Tags can be optional (Evgeny)
+* Fixed dependency of Django up to 1.3.1, because settings must be upgraded
+  for Django 1.4 (Evgeny)
 
 0.7.39 (Jan 11, 2012)
 ---------------------
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index caa07a08..71bc5cc9 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -37,6 +37,7 @@ Programming and documentation
 * `Jacob Oscarson <http://www.aspektratio.net>`_
 * `Radim Řehůřek <https://github.com/piskvorky>`_
 * `monkut <https://github.com/monkut>`_
+* `Jim Tittsler <http://wikieducator.org/User:JimTittsler>`_
 
 Translations
 ------------
diff --git a/askbot/tests/form_tests.py b/askbot/tests/form_tests.py
index 22f2a77c..4c67c1ff 100644
--- a/askbot/tests/form_tests.py
+++ b/askbot/tests/form_tests.py
@@ -50,6 +50,8 @@ class AskByEmailFormTests(AskbotTestCase):
     def test_subject_line(self):
         """loops through various forms of the subject line
         and makes sure that tags and title are parsed out"""
+        setting_backup = askbot_settings.TAGS_ARE_REQUIRED
+        askbot_settings.update('TAGS_ARE_REQUIRED', True)
         for test_case in SUBJECT_LINE_CASES:
             self.data['subject'] = test_case[0]
             form = forms.AskByEmailForm(self.data)
@@ -66,6 +68,7 @@ class AskByEmailFormTests(AskbotTestCase):
                     form.cleaned_data['title'],
                     output[1]
                 )
+        askbot_settings.update('TAGS_ARE_REQUIRED', setting_backup)
 
     def test_email(self):
         """loops through variants of the from field 
diff --git a/askbot/views/readers.py b/askbot/views/readers.py
index 5ff7889d..7886439c 100644
--- a/askbot/views/readers.py
+++ b/askbot/views/readers.py
@@ -525,7 +525,7 @@ def question(request, id):#refactor - long subroutine. display question body, an
     )
 
     data = {
-        'is_cacheable': is_cacheable,
+        'is_cacheable': False,#is_cacheable, #temporary, until invalidation fix
         'long_time': const.LONG_TIME,#"forever" caching
         'page_class': 'question-page',
         'active_tab': 'questions',
diff --git a/askbot/views/users.py b/askbot/views/users.py
index c625aeab..582bb2af 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -40,7 +40,7 @@ from askbot.models.badges import award_badges_signal
 from askbot.skins.loaders import render_into_skin
 from askbot.templatetags import extra_tags
 from askbot.search.state_manager import SearchState
-
+from askbot.utils import url_utils
 
 def owner_or_moderator_required(f):
     @functools.wraps(f)
@@ -51,7 +51,7 @@ def owner_or_moderator_required(f):
             pass
         else:
             params = '?next=%s' % request.path
-            return HttpResponseRedirect(reverse('user_signin') + params)
+            return HttpResponseRedirect(url_utils.get_login_url() + params)
         return f(request, profile_owner, context)
     return wrapped_func
 
diff --git a/askbot_requirements.txt b/askbot_requirements.txt
index 5bf06e30..301fb93e 100644
--- a/askbot_requirements.txt
+++ b/askbot_requirements.txt
@@ -1,5 +1,5 @@
 akismet
-django>=1.1.2
+django==1.3.1
 Jinja2
 Coffin>=0.3
 South>=0.7.1
diff --git a/askbot_requirements_dev.txt b/askbot_requirements_dev.txt
index e05e53b6..199f0308 100644
--- a/askbot_requirements_dev.txt
+++ b/askbot_requirements_dev.txt
@@ -1,5 +1,5 @@
 akismet
-django>=1.1.2
+django==1.3.1
 Jinja2
 Coffin>=0.3
 South>=0.7.1