Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fixed a bug that broke the group join button | Evgeny Fadeev | 2012-09-03 | 4 | -4/+5 |
| | |||||
* | added more changes that should have been included into the previous commit | Evgeny Fadeev | 2012-09-03 | 7 | -41/+68 |
| | |||||
* | added UI to set group openness and prepared ground for "ask to join" function | Evgeny Fadeev | 2012-09-03 | 9 | -25/+478 |
| | |||||
* | added the openness field to group and migrated data from is_open to openness | Evgeny Fadeev | 2012-09-02 | 4 | -1/+746 |
| | |||||
* | made get_moderators function group-aware | Evgeny Fadeev | 2012-09-02 | 5 | -16/+51 |
| | |||||
* | whitespace only changes | Evgeny Fadeev | 2012-09-02 | 2 | -6/+9 |
| | |||||
* | Merge branch 'adolfo' into user-groups | Evgeny Fadeev | 2012-08-31 | 10 | -78/+181 |
|\ | |||||
| * | fixed style that I broke in the last commit | Adolfo Fitoria | 2012-08-31 | 2 | -0/+2 |
| | | |||||
| * | fixed dropdown style | Adolfo Fitoria | 2012-08-31 | 2 | -8/+11 |
| | | |||||
| * | improved ask widget styles | Adolfo Fitoria | 2012-08-31 | 2 | -8/+46 |
| | | |||||
| * | improved group dropdown styles | Adolfo Fitoria | 2012-08-31 | 2 | -13/+16 |
| | | |||||
| * | fixed bug in javascript | Adolfo Fitoria | 2012-08-30 | 1 | -1/+2 |
| | | |||||
| * | Added more styules and focus out function in the sugested live search. | Adolfo Fitoria | 2012-08-30 | 2 | -9/+22 |
| | | |||||
| * | fixed style error in related question function | Adolfo Fitoria | 2012-08-30 | 1 | -0/+9 |
| | | |||||
| * | made related questions work again | Adolfo Fitoria | 2012-08-30 | 1 | -4/+4 |
| | | |||||
| * | fixed issue with Javascript and firefox | Adolfo Fitoria | 2012-08-30 | 2 | -4/+5 |
| | | |||||
| * | styles again | Adolfo Fitoria | 2012-08-30 | 1 | -2/+2 |
| | | |||||
| * | improved styling | Adolfo Fitoria | 2012-08-30 | 4 | -3/+29 |
| | | |||||
| * | set focus on the askwidget title element | Adolfo Fitoria | 2012-08-30 | 2 | -4/+8 |
| | | |||||
| * | forgot to comment out this lines | Adolfo Fitoria | 2012-08-30 | 1 | -10/+10 |
| | | |||||
| * | changed order in form fields | Adolfo Fitoria | 2012-08-30 | 1 | -1/+1 |
| | | |||||
| * | Fixed command view to add group | Adolfo Fitoria | 2012-08-30 | 1 | -1/+2 |
| | | |||||
| * | forgot to include one field in form | Adolfo Fitoria | 2012-08-30 | 1 | -0/+1 |
| | | |||||
| * | Temporal: commented the old tag/group relationship to fix later | Adolfo Fitoria | 2012-08-30 | 2 | -17/+18 |
| | | |||||
* | | restored full text search for the users in postgres | Evgeny Fadeev | 2012-08-31 | 1 | -0/+12 |
| | | |||||
* | | fixed migration for user groups | Evgeny Fadeev | 2012-08-31 | 2 | -1/+99 |
| | | |||||
* | | replaced database migrations with the ones that work with postgresql | Evgeny Fadeev | 2012-08-31 | 5 | -3/+1290 |
|\ \ | |||||
| * | | migrations to new group models work | Evgeny Fadeev | 2012-08-31 | 5 | -25/+454 |
| | | | |||||
| * | | migration of data starts to work | Evgeny Fadeev | 2012-08-31 | 1 | -0/+430 |
| | | | |||||
| * | | added group and relations group-post group-thread, work in postgres | Evgeny Fadeev | 2012-08-30 | 5 | -3/+444 |
| | | | |||||
| * | | added explicit M2M relation between thread and tag | Evgeny Fadeev | 2012-08-30 | 1 | -1/+14 |
| | | | |||||
* | | | deleted broken migrations | Evgeny Fadeev | 2012-08-31 | 3 | -925/+0 |
| |/ |/| | |||||
* | | merged Adolfos and my branches | Evgeny Fadeev | 2012-08-30 | 3 | -20/+22 |
|\ \ | |||||
| * | | temporary commit showing an import error causing syncdb to fail in postgres | Evgeny Fadeev | 2012-08-29 | 1 | -2/+2 |
| | | | |||||
* | | | moved forms, partially broken due to Tag/Group model migration | Adolfo Fitoria | 2012-08-29 | 4 | -94/+100 |
| | | | |||||
* | | | temporal fix for syncdb bug | Adolfo Fitoria | 2012-08-29 | 1 | -1/+3 |
| | | | |||||
* | | | spoted and unclosed " mark | Adolfo Fitoria | 2012-08-29 | 1 | -1/+1 |
| | | | |||||
* | | | made tinymce work on the widgets | Adolfo Fitoria | 2012-08-29 | 4 | -5/+2 |
| | | | |||||
* | | | Made WMD editor work in the widget | Adolfo Fitoria | 2012-08-29 | 4 | -15/+51 |
| | | | |||||
* | | | Revert "Added models/group.py to start migrationg the new Group model from Tag" | Adolfo Fitoria | 2012-08-29 | 11 | -64/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1975772d504efa3aab494b49f1d0c1176225ba5c. Conflicts: askbot/models/post.py askbot/models/tag.py askbot/tests/db_api_tests.py askbot/views/users.py | ||||
* | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups | Adolfo Fitoria | 2012-08-29 | 17 | -219/+259 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/context.py askbot/models/post.py askbot/models/tag.py askbot/tests/db_api_tests.py askbot/views/users.py | ||||
| * | | tests pass, but group-related features need some manual testing and more ↵ | Evgeny Fadeev | 2012-08-29 | 16 | -156/+154 |
| | | | | | | | | | | | | test cases | ||||
| * | | switched from relations to auth_group to askbot_group | Evgeny Fadeev | 2012-08-28 | 3 | -4/+3 |
| | | | |||||
| * | | removed old askbot group models | Evgeny Fadeev | 2012-08-27 | 6 | -65/+80 |
| | | | |||||
| * | | made the migration print nicer output | Evgeny Fadeev | 2012-08-27 | 1 | -9/+8 |
| | | | |||||
* | | | Merge branch 'user-groups' of github.com:fitoria/askbot-devel into user-groups | Adolfo Fitoria | 2012-08-28 | 1 | -33/+0 |
|\ \ \ | |||||
| * | | | Cleaning code. | Adolfo Fitoria | 2012-08-28 | 1 | -33/+0 |
| | | | | |||||
* | | | | Merge branch 'master' of github.com:fitoria/askbot-devel into user-groups | Adolfo Fitoria | 2012-08-28 | 0 | -0/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-08-14 | 13 | -207/+350 |
| |\ \ \ | |||||
* | | | | | improved related question in the widget feature | Adolfo Fitoria | 2012-08-28 | 5 | -24/+85 |
| | | | | |