summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Temporal: commented the old tag/group relationship to fix laterAdolfo Fitoria2012-08-302-17/+18
* | | | | restored full text search for the users in postgresEvgeny Fadeev2012-08-311-0/+12
* | | | | fixed migration for user groupsEvgeny Fadeev2012-08-312-1/+99
* | | | | replaced database migrations with the ones that work with postgresqlEvgeny Fadeev2012-08-315-3/+1290
|\ \ \ \ \
| * | | | | migrations to new group models workEvgeny Fadeev2012-08-315-25/+454
| * | | | | migration of data starts to workEvgeny Fadeev2012-08-311-0/+430
| * | | | | added group and relations group-post group-thread, work in postgresEvgeny Fadeev2012-08-305-3/+444
| * | | | | added explicit M2M relation between thread and tagEvgeny Fadeev2012-08-301-1/+14
* | | | | | deleted broken migrationsEvgeny Fadeev2012-08-313-925/+0
| |/ / / / |/| | | |
* | | | | merged Adolfos and my branchesEvgeny Fadeev2012-08-303-20/+22
|\ \ \ \ \
| * | | | | 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-294-94/+100
* | | | | | temporal fix for syncdb bugAdolfo Fitoria2012-08-291-1/+3
* | | | | | spoted and unclosed " markAdolfo Fitoria2012-08-291-1/+1
* | | | | | made tinymce work on the widgetsAdolfo Fitoria2012-08-294-5/+2
* | | | | | Made WMD editor work in the widgetAdolfo Fitoria2012-08-294-15/+51
* | | | | | Revert "Added models/group.py to start migrationg the new Group model from Tag"Adolfo Fitoria2012-08-2911-64/+25
* | | | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-2917-219/+259
|\| | | | |
| * | | | | tests pass, but group-related features need some manual testing and more test...Evgeny Fadeev2012-08-2916-156/+154
| * | | | | switched from relations to auth_group to askbot_groupEvgeny Fadeev2012-08-283-4/+3
| * | | | | removed old askbot group modelsEvgeny Fadeev2012-08-276-65/+80
| * | | | | made the migration print nicer outputEvgeny Fadeev2012-08-271-9/+8
* | | | | | Merge branch 'user-groups' of github.com:fitoria/askbot-devel into user-groupsAdolfo Fitoria2012-08-281-33/+0
|\ \ \ \ \ \
| * | | | | | Cleaning code.Adolfo Fitoria2012-08-281-33/+0
* | | | | | | Merge branch 'master' of github.com:fitoria/askbot-devel into user-groupsAdolfo Fitoria2012-08-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-08-1413-207/+350
| |\ \ \ \ \
* | | | | | | improved related question in the widget featureAdolfo Fitoria2012-08-285-24/+85
* | | | | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-281-6/+9
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | remove _internal_ prefix from the group name in migrationEvgeny Fadeev2012-08-271-4/+5
| * | | | | | one more stepEvgeny Fadeev2012-08-271-3/+5
| * | | | | | migration works one step further!Evgeny Fadeev2012-08-261-1/+1
* | | | | | | Merge branch 'user-groups-clean' into user-groupsAdolfo Fitoria2012-08-274-6/+54
|\ \ \ \ \ \ \
| * | | | | | | added related questions to the widgetsAdolfo Fitoria2012-08-274-6/+54
* | | | | | | | Merge branch 'user-groups-clean' into user-groupsAdolfo Fitoria2012-08-271-0/+4
|\| | | | | | |
| * | | | | | | resized widget according to contentsAdolfo Fitoria2012-08-271-0/+4
* | | | | | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-2711-21/+963
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / /
| * | | / / / broken commit - migration 137 fails!Evgeny Fadeev2012-08-2611-21/+963
| | |_|/ / / | |/| | | |
* | | | | | Added models/group.py to start migrationg the new Group model from TagAdolfo Fitoria2012-08-2411-74/+81
* | | | | | Modified $.post() for $.ajax()Adolfo Fitoria2012-08-242-9/+13
* | | | | | recompiled lessAdolfo Fitoria2012-08-241-7/+5
* | | | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-247-18/+32
|\| | | | |
| * | | | | small bug fixesEvgeny Fadeev2012-08-247-14/+32
* | | | | | fixed css and some jsAdolfo Fitoria2012-08-233-17/+187
* | | | | | initial add group tag in the menuAdolfo Fitoria2012-08-237-8/+143
|/ / / / /
* | | | | grammarEvgeny Fadeev2012-08-231-1/+1
* | | | | style adjustment for the groups listing tableEvgeny Fadeev2012-08-231-0/+4
* | | | | Merge branch 'tag-editor' into user-groupsEvgeny Fadeev2012-08-231-0/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | allow users override username and email retrieved from ldapEvgeny Fadeev2012-08-221-0/+4
* | | | | Merge branch 'adolfo-user-groups' into user-groupsEvgeny Fadeev2012-08-234-13/+16
|\ \ \ \ \
| * | | | | Group menu displays on hover, small css issue with the aligmentsAdolfo Fitoria2012-08-224-15/+16