diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-12-05 17:54:38 -0300 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-12-05 17:54:38 -0300 |
| commit | 2011383985288497db3322a2d05c8aa6f8f5e8d6 (patch) | |
| tree | 3782c3047ba7a435ff4993d1081ed6e98b207b04 /askbot/const | |
| parent | 56a3187a88927e8eb1bdc1c48f3f230ec5e42580 (diff) | |
| download | askbot-2011383985288497db3322a2d05c8aa6f8f5e8d6.tar.gz askbot-2011383985288497db3322a2d05c8aa6f8f5e8d6.tar.bz2 askbot-2011383985288497db3322a2d05c8aa6f8f5e8d6.zip | |
bugfixes: 1) global subscribers get emails even if frequency is zero; 2) if subscribed tag set is enabled users wont get emails on tag subscription; 3) if email is read-only email is lost upon editing user profile; 4) in some browsers there is horizontal scroll in the post body, which should not be there
Diffstat (limited to 'askbot/const')
| -rw-r--r-- | askbot/const/__init__.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/askbot/const/__init__.py b/askbot/const/__init__.py index 977cf0c5..9ec48b87 100644 --- a/askbot/const/__init__.py +++ b/askbot/const/__init__.py @@ -316,11 +316,23 @@ TAG_DISPLAY_FILTER_STRATEGY_CHOICES = \ TAG_DISPLAY_FILTER_STRATEGY_MINIMAL_CHOICES + \ ((INCLUDE_SUBSCRIBED, _('only subscribed tags')),) +TAG_EMAIL_FILTER_SIMPLE_STRATEGY_CHOICES = ( + (INCLUDE_ALL, _('email for all tags')), + (EXCLUDE_IGNORED, _('exclude ignored tags')), + (INCLUDE_INTERESTING, _('only interesting tags')), +) + +TAG_EMAIL_FILTER_ADVANCED_STRATEGY_CHOICES = ( + (INCLUDE_ALL, _('email for all tags')), + (EXCLUDE_IGNORED, _('exclude ignored tags')), + (INCLUDE_SUBSCRIBED, _('only subscribed tags')), +) -TAG_EMAIL_FILTER_STRATEGY_CHOICES = ( +TAG_EMAIL_FILTER_FULL_STRATEGY_CHOICES = ( (INCLUDE_ALL, _('email for all tags')), (EXCLUDE_IGNORED, _('exclude ignored tags')), - (INCLUDE_INTERESTING, _('only subscribed tags')), + (INCLUDE_INTERESTING, _('only interesting tags')), + (INCLUDE_SUBSCRIBED, _('only subscribed tags')), ) NOTIFICATION_DELIVERY_SCHEDULE_CHOICES = ( |