diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-12-15 16:57:37 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-12-15 16:57:37 -0600 |
| commit | 9d1fb9890b97beb55461ca34f9757bc685461130 (patch) | |
| tree | 1f8f0552ba6f4ca092aaa5a5347f0ad07433f1de /forum/const.py | |
| parent | ebb0f636ae8f7db4e7a2e7470e449af3d96b15c0 (diff) | |
| parent | 82d35490db90878f013523c4d1a5ec3af2df8b23 (diff) | |
| download | askbot-9d1fb9890b97beb55461ca34f9757bc685461130.tar.gz askbot-9d1fb9890b97beb55461ca34f9757bc685461130.tar.bz2 askbot-9d1fb9890b97beb55461ca34f9757bc685461130.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
INSTALL
LICENSE
TODO
cnprog.wsgi
context.py
development.log
forum/feed.py
forum/forms.py
forum/management/commands/send_email_alerts.py
forum/managers.py
forum/models.py
forum/templatetags/extra_filters.py
forum/templatetags/extra_tags.py
forum/urls.py
forum/views.py
locale/en/LC_MESSAGES/django.mo
locale/en/LC_MESSAGES/django.po
middleware/__init__.py
middleware/anon_user.py
settings.py
settings_local.py.dist
templates/about.html
templates/authopenid/complete.html
templates/authopenid/external_legacy_login_info.html
templates/base.html
templates/base_content.html
templates/content/js/com.cnprog.admin.js
templates/content/js/com.cnprog.i18n.js
templates/content/js/com.cnprog.post.js
templates/content/js/com.cnprog.utils.js
templates/content/js/wmd/wmd.js
templates/content/style/style.css
templates/question.html
templates/questions.html
templates/unanswered.html
templates/user_email_subscriptions.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
Diffstat (limited to 'forum/const.py')
| -rw-r--r-- | forum/const.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/forum/const.py b/forum/const.py index 9b9230c0..76fd4a24 100644 --- a/forum/const.py +++ b/forum/const.py @@ -49,6 +49,7 @@ TYPE_ACTIVITY_MARK_OFFENSIVE=14 TYPE_ACTIVITY_UPDATE_TAGS=15 TYPE_ACTIVITY_FAVORITE=16 TYPE_ACTIVITY_USER_FULL_UPDATED = 17 +TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT = 18 #TYPE_ACTIVITY_EDIT_QUESTION=17 #TYPE_ACTIVITY_EDIT_ANSWER=18 @@ -70,6 +71,7 @@ TYPE_ACTIVITY = ( (TYPE_ACTIVITY_UPDATE_TAGS, _('updated tags')), (TYPE_ACTIVITY_FAVORITE, _('selected favorite')), (TYPE_ACTIVITY_USER_FULL_UPDATED, _('completed user profile')), + (TYPE_ACTIVITY_QUESTION_EMAIL_UPDATE_SENT, _('email update sent to user')), ) TYPE_RESPONSE = { @@ -85,3 +87,6 @@ CONST = { 'default_version' : _('initial version'), 'retagged' : _('retagged'), } + +#how to filter questions by tags in email digests? +TAG_EMAIL_FILTER_CHOICES = (('ignored', _('exclude ignored tags')),('interesting',_('allow only selected tags'))) |