From 8739fd9ff1a5cc4aa7e6c10563858d83ae7d1067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Radim=20=C5=98eh=C5=AF=C5=99ek?= Date: Tue, 27 Mar 2012 21:57:53 +0300 Subject: Update askbot/views/users.py --- askbot/views/users.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3-1-g7c22 From 973d004c42873b7842ab2ddfb962bec22c51a503 Mon Sep 17 00:00:00 2001 From: Jim Tittsler Date: Wed, 28 Mar 2012 10:49:14 +1300 Subject: correct typo in admin interface menu --- askbot/conf/license.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) -- cgit v1.2.3-1-g7c22 From 790cae983cc1ac0a78d8eddc2a9176d801fe6306 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Tue, 27 Mar 2012 20:47:49 -0400 Subject: added Jim Tittsler to the list of contributors for the typo fix --- askbot/doc/source/contributors.rst | 1 + 1 file changed, 1 insertion(+) 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 `_ * `Radim Řehůřek `_ * `monkut `_ +* `Jim Tittsler `_ Translations ------------ -- cgit v1.2.3-1-g7c22 From c65c7cdb0f600c2c8eba2cca63377fd81928401c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 29 Mar 2012 17:06:38 -0400 Subject: bumped version to 0.7.40 --- askbot/__init__.py | 2 +- askbot/doc/source/changelog.rst | 6 ++++-- askbot/tests/form_tests.py | 3 +++ askbot/views/readers.py | 2 +- askbot_requirements.txt | 2 +- askbot_requirements_dev.txt | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/askbot/__init__.py b/askbot/__init__.py index 7b8a7280..0962acd8 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -15,7 +15,7 @@ VERSION = (0, 7, 39) #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/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 `_) * 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 `_) * 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/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_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 -- cgit v1.2.3-1-g7c22 From 4ff87c85bc560363e0ae6e15f357fc51299fd866 Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Thu, 29 Mar 2012 20:27:19 -0400 Subject: incremented the revision for real and prepared for the release --- .gitignore | 1 + MANIFEST.in | 3 +++ askbot/__init__.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) 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 0962acd8..5a8afcaa 100644 --- a/askbot/__init__.py +++ b/askbot/__init__.py @@ -9,7 +9,7 @@ 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 -- cgit v1.2.3-1-g7c22