summaryrefslogtreecommitdiffstats
path: root/askbot/models
Commit message (Expand)AuthorAgeFilesLines
* Temporal: commented the old tag/group relationship to fix laterAdolfo Fitoria2012-08-301-3/+4
* merged Adolfos and my branchesEvgeny Fadeev2012-08-301-9/+3
|\
| * temporary commit showing an import error causing syncdb to fail in postgresEvgeny Fadeev2012-08-291-2/+2
* | moved forms, partially broken due to Tag/Group model migrationAdolfo Fitoria2012-08-291-87/+6
* | temporal fix for syncdb bugAdolfo Fitoria2012-08-291-1/+3
* | Revert "Added models/group.py to start migrationg the new Group model from Tag"Adolfo Fitoria2012-08-296-57/+19
* | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-295-135/+115
|\|
| * tests pass, but group-related features need some manual testing and more test...Evgeny Fadeev2012-08-295-80/+88
| * switched from relations to auth_group to askbot_groupEvgeny Fadeev2012-08-283-4/+3
| * removed old askbot group modelsEvgeny Fadeev2012-08-275-65/+11
* | Merge branch 'user-groups-clean' into user-groupsAdolfo Fitoria2012-08-271-0/+6
|\ \
| * | added related questions to the widgetsAdolfo Fitoria2012-08-271-0/+6
* | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-274-4/+53
|\ \ \ | |/ / |/| / | |/
| * broken commit - migration 137 fails!Evgeny Fadeev2012-08-264-4/+53
* | Added models/group.py to start migrationg the new Group model from TagAdolfo Fitoria2012-08-246-57/+65
* | initial add group tag in the menuAdolfo Fitoria2012-08-231-1/+1
|/
* fixed post-merge errorsEvgeny Fadeev2012-08-221-2/+2
* completed merge of user-groups with tag-editor, not tested yetEvgeny Fadeev2012-08-225-31/+204
|\
| * fixed a monkeypatching induced bug in the follow user testsEvgeny Fadeev2012-08-201-8/+8
| * Fixed templates and migrationAdolfo Fitoria2012-08-191-9/+37
| * Modified the question widget view to match the new style,Adolfo Fitoria2012-08-181-2/+15
| * Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-181-0/+28
| |\
| | * Merge branch 'adolfo-user-groups' into user-groupsEvgeny Fadeev2012-08-171-4/+13
| | |\
| | * | limited shared with list on thread pageEvgeny Fadeev2012-08-171-0/+28
| * | | Merge branch 'master' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-181-9/+6
| |\ \ \
| | * | | Added options to restrict email addresses and requirement to validate an emai...Evgeny Fadeev2012-08-121-9/+6
| * | | | refactored views, made them generic, added translations into the urls.Adolfo Fitoria2012-08-181-0/+2
| * | | | Temporal commit I'll made generic views for the widgets in this momentAdolfo Fitoria2012-08-172-2/+26
| | |_|/ | |/| |
| * | | fixed list_ask_widget templateAdolfo Fitoria2012-08-161-1/+8
| * | | filtered out internal groups in the create ask widget formAdolfo Fitoria2012-08-161-2/+2
| * | | Fixed bugs on the widget creator and widget js code.Adolfo Fitoria2012-08-161-2/+4
| | |/ | |/|
| * | cosmetic fixes in the widget setupEvgeny Fadeev2012-08-162-5/+23
| * | Fixed some stylesAdolfo Fitoria2012-08-141-4/+2
| * | Merge branch 'user-groups' into widget-creatorAdolfo Fitoria2012-08-103-45/+134
| |\ \
| | * | made notifications work for the thread sharingEvgeny Fadeev2012-08-103-24/+18
| | * | refactored the notification issuing function on the postEvgeny Fadeev2012-08-091-9/+104
| | * | fixed filtering of notifications by the user groupsEvgeny Fadeev2012-08-091-20/+20
| | * | Merge branch 'master' into user-groupsEvgeny Fadeev2012-08-082-11/+21
| | |\|
| | * | allow people sharing questions with "foreign" groupsEvgeny Fadeev2012-08-084-3/+38
| * | | initial steps for the widget creatorAdolfo Fitoria2012-08-102-14/+54
| * | | allow people sharing questions with "foreign" groupsEvgeny Fadeev2012-08-084-3/+38
| * | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-073-4/+12
| |\| |
| | * | made it impossible to leave the "everyone" groupEvgeny Fadeev2012-08-073-4/+12
| * | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-064-195/+885
| |\| | | | |/ | |/|
| | * fixed "share with everyone" and sharing threads with multiple groupsEvgeny Fadeev2012-08-054-88/+169
| | * added global user groupEvgeny Fadeev2012-08-034-48/+149
| | * merged with the tag-editor branchEvgeny Fadeev2012-07-301-0/+20
| | |\
| | * | draft saving starts working, incomplete for answersEvgeny Fadeev2012-07-263-0/+31
| | * | merged master branch againEvgeny Fadeev2012-07-263-6/+15
| | |\ \
| | * | | merged the master branchEvgeny Fadeev2012-07-264-16/+23