Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'user-groups-clean' into user-groups | Adolfo Fitoria | 2012-08-27 | 1 | -0/+4 |
|\ | |||||
| * | resized widget according to contents | Adolfo Fitoria | 2012-08-27 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups | Adolfo Fitoria | 2012-08-27 | 11 | -21/+963 |
|\ \ | |/ |/| | |||||
| * | broken commit - migration 137 fails! | Evgeny Fadeev | 2012-08-26 | 11 | -21/+963 |
| | | |||||
* | | Added models/group.py to start migrationg the new Group model from Tag | Adolfo Fitoria | 2012-08-24 | 11 | -74/+81 |
| | | | | | | | | model | ||||
* | | Modified $.post() for $.ajax() | Adolfo Fitoria | 2012-08-24 | 2 | -9/+13 |
| | | |||||
* | | recompiled less | Adolfo Fitoria | 2012-08-24 | 1 | -7/+5 |
| | | |||||
* | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups | Adolfo Fitoria | 2012-08-24 | 7 | -18/+32 |
|\| | | | | | | | | | Conflicts: askbot/skins/default/media/style/style.less | ||||
| * | small bug fixes | Evgeny Fadeev | 2012-08-24 | 7 | -14/+32 |
| | | |||||
* | | fixed css and some js | Adolfo Fitoria | 2012-08-23 | 3 | -17/+187 |
| | | |||||
* | | initial add group tag in the menu | Adolfo Fitoria | 2012-08-23 | 7 | -8/+143 |
|/ | |||||
* | grammar | Evgeny Fadeev | 2012-08-23 | 1 | -1/+1 |
| | |||||
* | style adjustment for the groups listing table | Evgeny Fadeev | 2012-08-23 | 1 | -0/+4 |
| | |||||
* | Merge branch 'tag-editor' into user-groups | Evgeny Fadeev | 2012-08-23 | 1 | -0/+4 |
|\ | |||||
| * | allow users override username and email retrieved from ldap | Evgeny Fadeev | 2012-08-22 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'adolfo-user-groups' into user-groups | Evgeny Fadeev | 2012-08-23 | 4 | -13/+16 |
|\ \ | |||||
| * | | Group menu displays on hover, small css issue with the aligments | Adolfo Fitoria | 2012-08-22 | 4 | -15/+16 |
| | | | |||||
* | | | added member count to the groups page | Evgeny Fadeev | 2012-08-23 | 4 | -7/+29 |
| | | | |||||
* | | | simplified the login/signup pages, no more "signup for updates" question | Evgeny Fadeev | 2012-08-23 | 5 | -68/+24 |
| | | | |||||
* | | | added tinymce config checker for the settings.py | Evgeny Fadeev | 2012-08-23 | 9 | -7/+150 |
| | | | |||||
* | | | edited a comment in js | Evgeny Fadeev | 2012-08-22 | 1 | -0/+6 |
| | | | |||||
* | | | edited a comment in js | Evgeny Fadeev | 2012-08-22 | 1 | -0/+4 |
| | | | |||||
* | | | added doc strings explaining the main javascript pattern used in askbot | Evgeny Fadeev | 2012-08-22 | 1 | -3/+92 |
| | | | |||||
* | | | merged adolfos branch | Evgeny Fadeev | 2012-08-22 | 13 | -134/+544 |
|\| | | |||||
| * | | fixed errors in sprite generation | Adolfo Fitoria | 2012-08-21 | 4 | -15/+15 |
| | | | |||||
| * | | recompiled styles.less to styles.css | Adolfo Fitoria | 2012-08-21 | 1 | -40/+368 |
| | | | |||||
| * | | added dropdown menu to lists groups in the templates, modified the sprite ↵ | Adolfo Fitoria | 2012-08-21 | 10 | -89/+137 |
| | | | | | | | | | | | | file to make it work better | ||||
| * | | if groups are enabled the /users/ url will redirect to the general group | Adolfo Fitoria | 2012-08-21 | 3 | -7/+22 |
| | | | |||||
* | | | fixed post-merge errors | Evgeny Fadeev | 2012-08-22 | 6 | -57/+6 |
| | | | |||||
* | | | fixed autocompleter and tipped input for the ask as someone else fields | Evgeny Fadeev | 2012-08-22 | 3 | -8/+10 |
| | | | |||||
* | | | completed merge of user-groups with tag-editor, not tested yet | Evgeny Fadeev | 2012-08-22 | 55 | -469/+2731 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch 'master' into user-groups | Evgeny Fadeev | 2012-08-21 | 2 | -1/+0 |
| |\ \ | | |/ | |/| | |||||
| | * | re-enabled self-answer | Evgeny Fadeev | 2012-08-21 | 1 | -1/+0 |
| | | | |||||
| | * | deleted an unused file | Evgeny Fadeev | 2012-08-20 | 1 | -0/+0 |
| | | | |||||
| * | | fixed template in widget list added iframe closing tag | Adolfo Fitoria | 2012-08-21 | 1 | -1/+1 |
| | | | |||||
| * | | redesigned the sharing sidebar | Evgeny Fadeev | 2012-08-21 | 7 | -41/+913 |
| | | | |||||
| * | | fixed a monkeypatching induced bug in the follow user tests | Evgeny Fadeev | 2012-08-20 | 1 | -8/+8 |
| | | | |||||
| * | | added cache to the view | Adolfo Fitoria | 2012-08-20 | 1 | -3/+4 |
| | | | |||||
| * | | deleted conf/widgets.py this file won't be needed anymore | Adolfo Fitoria | 2012-08-20 | 2 | -100/+0 |
| | | | |||||
| * | | fixed validation error with the question body editor field | Adolfo Fitoria | 2012-08-20 | 1 | -1/+4 |
| | | | |||||
| * | | fixed test case with url that does not exists anymore | Adolfo Fitoria | 2012-08-20 | 1 | -8/+8 |
| | | | |||||
| * | | moved forgotten files | Adolfo Fitoria | 2012-08-20 | 2 | -0/+0 |
| | | | |||||
| * | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups | Adolfo Fitoria | 2012-08-20 | 10 | -15/+250 |
| |\ \ | |||||
| | * | | popups for shared with users and groups lists | Evgeny Fadeev | 2012-08-20 | 10 | -15/+250 |
| | | | | |||||
| * | | | Fixed templates and migration | Adolfo Fitoria | 2012-08-19 | 6 | -14/+55 |
| | | | | |||||
| * | | | Modified the question widget view to match the new style, | Adolfo Fitoria | 2012-08-18 | 7 | -36/+123 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added test case for this one, Modified the migration number 0135 to add the question widget table TODO: real life testing. | ||||
| * | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groups | Adolfo Fitoria | 2012-08-18 | 7 | -137/+91 |
| |\| | | |||||
| | * | | fixed shared with user count | Evgeny Fadeev | 2012-08-17 | 1 | -2/+2 |
| | | | | |||||
| | * | | fixed migration 135 | Evgeny Fadeev | 2012-08-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'adolfo-user-groups' into user-groups | Evgeny Fadeev | 2012-08-17 | 9 | -28/+131 |
| | |\ \ |