summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
* | | | | added member count to the groups pageEvgeny Fadeev2012-08-234-7/+29
* | | | | simplified the login/signup pages, no more "signup for updates" questionEvgeny Fadeev2012-08-235-68/+24
* | | | | added tinymce config checker for the settings.pyEvgeny Fadeev2012-08-239-7/+150
* | | | | edited a comment in jsEvgeny Fadeev2012-08-221-0/+6
* | | | | edited a comment in jsEvgeny Fadeev2012-08-221-0/+4
* | | | | added doc strings explaining the main javascript pattern used in askbotEvgeny Fadeev2012-08-221-3/+92
* | | | | merged adolfos branchEvgeny Fadeev2012-08-2213-134/+544
|\| | | |
| * | | | fixed errors in sprite generationAdolfo Fitoria2012-08-214-15/+15
| * | | | recompiled styles.less to styles.cssAdolfo Fitoria2012-08-211-40/+368
| * | | | added dropdown menu to lists groups in the templates, modified the sprite fil...Adolfo Fitoria2012-08-2110-89/+137
| * | | | if groups are enabled the /users/ url will redirect to the general groupAdolfo Fitoria2012-08-213-7/+22
* | | | | fixed post-merge errorsEvgeny Fadeev2012-08-226-57/+6
* | | | | fixed autocompleter and tipped input for the ask as someone else fieldsEvgeny Fadeev2012-08-223-8/+10
* | | | | completed merge of user-groups with tag-editor, not tested yetEvgeny Fadeev2012-08-2255-469/+2731
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Merge branch 'master' into user-groupsEvgeny Fadeev2012-08-212-1/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | re-enabled self-answerEvgeny Fadeev2012-08-211-1/+0
| | * | | deleted an unused fileEvgeny Fadeev2012-08-201-0/+0
| * | | | fixed template in widget list added iframe closing tagAdolfo Fitoria2012-08-211-1/+1
| * | | | redesigned the sharing sidebarEvgeny Fadeev2012-08-217-41/+913
| * | | | fixed a monkeypatching induced bug in the follow user testsEvgeny Fadeev2012-08-201-8/+8
| * | | | added cache to the viewAdolfo Fitoria2012-08-201-3/+4
| * | | | deleted conf/widgets.py this file won't be needed anymoreAdolfo Fitoria2012-08-202-100/+0
| * | | | fixed validation error with the question body editor fieldAdolfo Fitoria2012-08-201-1/+4
| * | | | fixed test case with url that does not exists anymoreAdolfo Fitoria2012-08-201-8/+8
| * | | | moved forgotten filesAdolfo Fitoria2012-08-202-0/+0
| * | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-2010-15/+250
| |\ \ \ \
| | * | | | popups for shared with users and groups listsEvgeny Fadeev2012-08-2010-15/+250
| * | | | | Fixed templates and migrationAdolfo Fitoria2012-08-196-14/+55
| * | | | | Modified the question widget view to match the new style,Adolfo Fitoria2012-08-187-36/+123
| * | | | | Merge branch 'user-groups' of github.com:ASKBOT/askbot-devel into user-groupsAdolfo Fitoria2012-08-187-137/+91
| |\| | | |
| | * | | | fixed shared with user countEvgeny Fadeev2012-08-171-2/+2
| | * | | | fixed migration 135Evgeny Fadeev2012-08-171-1/+1