merging to the trunk changes in the user model, commit 694

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@845 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/models/user.py b/forum/models/user.py
index d96426e2ad909db291bb6140d5377cda70686c5d..f8c91d65f10a11fddbfc61f917d1c60ddb2b1650 100644 (file)
--- a/forum/models/user.py
+++ b/forum/models/user.py
@@ -474,9 +474,6 @@ class SubscriptionSettings(models.Model):
     #auto_subscribe_to
     all_questions = models.BooleanField(default=False)
     all_questions_watched_tags = models.BooleanField(default=False)
     #auto_subscribe_to
     all_questions = models.BooleanField(default=False)
     all_questions_watched_tags = models.BooleanField(default=False)

-    questions_asked = models.BooleanField(default=True)
-    questions_answered = models.BooleanField(default=True)
-    questions_commented = models.BooleanField(default=False)

     questions_viewed = models.BooleanField(default=False)
 
     #notify activity on subscribed
     questions_viewed = models.BooleanField(default=False)
 
     #notify activity on subscribed