diff options
-rw-r--r-- | askbot/management/commands/send_unanswered_question_reminders.py | 4 | ||||
-rw-r--r-- | askbot/migrations/0124_auto__add_field_post_is_private__add_field_replyaddress_reply_action.py | 5 | ||||
-rw-r--r-- | askbot/models/question.py | 3 | ||||
-rw-r--r-- | askbot/skins/default/media/images/OpenSans-CondBold.ttf | bin | 0 -> 264372 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/OpenSans-CondLight.ttf | bin | 0 -> 221108 bytes | |||
-rw-r--r-- | askbot/skins/default/media/images/OpenSans-CondLightItalic.ttf | bin | 0 -> 210804 bytes | |||
-rw-r--r-- | askbot/skins/default/templates/django_error.html | 31 | ||||
-rw-r--r-- | askbot/skins/default/templates/meta/fonts.html | 16 | ||||
-rw-r--r-- | askbot/tests/db_api_tests.py | 7 | ||||
-rw-r--r-- | askbot/views/meta.py | 2 |
10 files changed, 54 insertions, 14 deletions
diff --git a/askbot/management/commands/send_unanswered_question_reminders.py b/askbot/management/commands/send_unanswered_question_reminders.py index 82b6ecd8..39402b25 100644 --- a/askbot/management/commands/send_unanswered_question_reminders.py +++ b/askbot/management/commands/send_unanswered_question_reminders.py @@ -43,6 +43,10 @@ class Command(NoArgsCommand): user_questions = questions.exclude(author = user) user_questions = user.get_tag_filtered_questions(user_questions) + if askbot_settings.GROUPS_ENABLED: + user_groups = user.get_groups() + user_questions = user_questions.filter(groups__in = user_groups) + final_question_list = user_questions.get_questions_needing_reminder( user = user, activity_type = const.TYPE_ACTIVITY_UNANSWERED_REMINDER_SENT, diff --git a/askbot/migrations/0124_auto__add_field_post_is_private__add_field_replyaddress_reply_action.py b/askbot/migrations/0124_auto__add_field_post_is_private__add_field_replyaddress_reply_action.py index ecb66552..18d511f9 100644 --- a/askbot/migrations/0124_auto__add_field_post_is_private__add_field_replyaddress_reply_action.py +++ b/askbot/migrations/0124_auto__add_field_post_is_private__add_field_replyaddress_reply_action.py @@ -9,6 +9,7 @@ class Migration(SchemaMigration): def forwards(self, orm): # Adding field 'Post.is_private' + db.start_transaction() db.add_column('askbot_post', 'is_private', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False) @@ -20,11 +21,15 @@ class Migration(SchemaMigration): # Changing field 'ReplyAddress.post' db.alter_column('askbot_replyaddress', 'post_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['askbot.Post'])) + db.commit_transaction() try: + db.start_transaction() # Adding field 'User.interesting_tags' db.add_column(u'auth_user', 'email_signature', self.gf('django.db.models.fields.TextField')(blank=True, default = ''), keep_default=False) + db.commit_transaction() except: + db.rollback_transaction() pass def backwards(self, orm): diff --git a/askbot/models/question.py b/askbot/models/question.py index 3453ff7c..3e8d2267 100644 --- a/askbot/models/question.py +++ b/askbot/models/question.py @@ -722,6 +722,9 @@ class Thread(models.Model): *IMPORTANT*: self._question_post() has to exist when update_tags() is called! """ + if tagnames.strip() == '': + return + previous_tags = list(self.tags.all()) previous_tagnames = set([tag.name for tag in previous_tags]) diff --git a/askbot/skins/default/media/images/OpenSans-CondBold.ttf b/askbot/skins/default/media/images/OpenSans-CondBold.ttf Binary files differnew file mode 100644 index 00000000..83966f21 --- /dev/null +++ b/askbot/skins/default/media/images/OpenSans-CondBold.ttf diff --git a/askbot/skins/default/media/images/OpenSans-CondLight.ttf b/askbot/skins/default/media/images/OpenSans-CondLight.ttf Binary files differnew file mode 100644 index 00000000..97c355b9 --- /dev/null +++ b/askbot/skins/default/media/images/OpenSans-CondLight.ttf diff --git a/askbot/skins/default/media/images/OpenSans-CondLightItalic.ttf b/askbot/skins/default/media/images/OpenSans-CondLightItalic.ttf Binary files differnew file mode 100644 index 00000000..0b45898d --- /dev/null +++ b/askbot/skins/default/media/images/OpenSans-CondLightItalic.ttf diff --git a/askbot/skins/default/templates/django_error.html b/askbot/skins/default/templates/django_error.html new file mode 100644 index 00000000..c1bfcc20 --- /dev/null +++ b/askbot/skins/default/templates/django_error.html @@ -0,0 +1,31 @@ +<html> + <head> + <title>Internal Server Error</title> + </head> + <body> + <h1>Internal Server Error</h1> + <p> + Most likely this is caused by an import error + within Django due to an incomplete setup of your + django project. + </p> + <p> + Please look into your error logs for more details. + </p> + <p> + Have you installed the database binding module? + </p> + <p> + If you made your own customizations - have you forgotten to + install some dependency module? Please note + that dependency modules may have their own dependencies, etc, + and they should also be satisfied. + </p> + <p> + If you need further assistance, please email at + <a href="mailto:support@askbot.com">support@askbot.com</a>, + post your question at <a href="http://askbot.org/en/questions/">AskBot Support Forum</a> + or call at +1-301-747-1533 (US). + <p> + </body> +</html> diff --git a/askbot/skins/default/templates/meta/fonts.html b/askbot/skins/default/templates/meta/fonts.html index f55d567c..e8e54a8f 100644 --- a/askbot/skins/default/templates/meta/fonts.html +++ b/askbot/skins/default/templates/meta/fonts.html @@ -1,20 +1,8 @@ <style type="text/css"> @font-face { - font-family: 'Yanone Kaffeesatz'; - font-style: normal; - font-weight: 400; - src: url('{{"/images/YanoneKaffeesatz-Regular.ttf"|media}}'); -} -@font-face { - font-family: 'Yanone Kaffeesatz'; + font-family: 'Open Sans Condensed'; font-style: normal; font-weight: 700; - src: url('{{"/images/YanoneKaffeesatz-Bold.ttf"|media}}'); -} -@font-face { - font-family: 'Yanone Kaffeesatz'; - font-style: normal; - font-weight: 300; - src: url('{{"/images/YanoneKaffeesatz-Light.ttf"|media}}'); + src: url('{{"/images/OpenSans-CondBold.ttf"|media}}'); } </style> diff --git a/askbot/tests/db_api_tests.py b/askbot/tests/db_api_tests.py index 3a0c9582..55cf0ef9 100644 --- a/askbot/tests/db_api_tests.py +++ b/askbot/tests/db_api_tests.py @@ -46,6 +46,13 @@ class DBApiTests(AskbotTestCase): self.assertTrue(post.deleted_by == None) self.assertTrue(post.deleted_at == None) + def test_blank_tags_impossible(self): + self.post_question(tags='') + self.assertEqual( + models.Tag.objects.filter(name='').count(), + 0 + ) + def test_flag_question(self): self.user.set_status('m') self.user.flag_post(self.question) diff --git a/askbot/views/meta.py b/askbot/views/meta.py index b8411b41..8e2c555e 100644 --- a/askbot/views/meta.py +++ b/askbot/views/meta.py @@ -23,6 +23,8 @@ from askbot import skins def generic_view(request, template = None, page_class = None): """this may be not necessary, since it is just a rewrite of render_into_skin""" + if request is None: # a plug for strange import errors in django startup + return render_to_response('django_error.html') return render_into_skin(template, {'page_class': page_class}, request) def config_variable(request, variable_name = None, mimetype = None): |