summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-test' of github.com:ASKBOT/askbot-devel into master-testEvgeny Fadeev2012-05-141-3/+3
|\
| * recompiled style.cssEvgeny Fadeev2012-05-141-3/+3
* | Merge branch 'master' into master-testEvgeny Fadeev2012-05-140-0/+0
|\ \ | |/ |/|
| * Merge branch 'github-master'Evgeny Fadeev2012-05-145-7/+6
| |\
* | \ merged byrons branch, needs review before merging to masterEvgeny Fadeev2012-05-0972-5553/+3
|\ \ \
| * \ \ Merge branch 'byron' of github.com:fitoria/askbot-devel into byronAdolfo Fitoria2012-05-086-9/+72
| |\ \ \
| | * \ \ Merge branch 'evgeny' into byronAdolfo Fitoria2012-05-0876-28060/+40952
| | |\ \ \ | | | | |/ | | | |/|
| * | | | adding selector close, missing after mergeByron Corrales2012-05-081-1/+0
| * | | | a little style fix of overlap when tags have big namesByron Corrales2012-05-082-2/+2
| * | | | Fixing vote buttons position on IE browsersByron Corrales2012-05-083-1/+12
| * | | | Making the style of the buttons a css style standart easy to customize with lessByron Corrales2012-05-084-190/+401
| * | | | Ignoring .DS_Store filesByron Corrales2012-05-081-0/+1
| * | | | updated feed class againAdolfo Fitoria2012-05-081-10/+27
| * | | | fixed feed issues with cache.Adolfo Fitoria2012-05-082-15/+14
| | |/ / | |/| |
* | | | merged the master branchEvgeny Fadeev2012-05-09182-1443/+21430
|\ \ \ \ | | |_|/ | |/| |
| * | | removed mistakenly committed lesscEvgeny Fadeev2012-05-0971-5550/+0
| * | | fixed a bug in an assertion statement and recompiled the css fileEvgeny Fadeev2012-05-0974-71/+5765
| * | | fixed css on the login and signup pagesEvgeny Fadeev2012-05-093-5/+8
| * | | fixed question page urls and updated test casesEvgeny Fadeev2012-05-095-26/+29
| * | | fixed the timezone issue in the newly posted commentsEvgeny Fadeev2012-05-091-1/+2
| * | | fixed bugs: lost attachment button, text floating over group control checkbox...Evgeny Fadeev2012-05-094-21/+22
| * | | added optional tag search boxEvgeny Fadeev2012-05-099-16/+200
| * | | fixed the migrationEvgeny Fadeev2012-05-081-5/+11
| * | | reintroduced lost migration for adding subscribed tag fieldEvgeny Fadeev2012-05-081-0/+312
| * | | modified migrations to match the modelsEvgeny Fadeev2012-05-082-325/+12
| * | | intermediate commit, removed two migrations and fixed bugsEvgeny Fadeev2012-05-081-8/+16
| * | | Merge branch 'master-test' into user-groupsEvgeny Fadeev2012-05-0815-70/+559
| |\ \ \
| | * | | tag selector works properlyEvgeny Fadeev2012-05-074-11/+21
| | * | | added a possibility to have independent set of "subscribed" tags in addition ...Evgeny Fadeev2012-05-0715-67/+546
| * | | | preapproved emails and email domains work for the groupsEvgeny Fadeev2012-05-088-26/+103
| |/ / /
| * | | saving pre-approved emails&domains works, but no validation yetEvgeny Fadeev2012-05-076-5/+260
| * | | added "anyone can join" control to the group profile editorEvgeny Fadeev2012-05-069-89/+172
| * | | the WMD editor can now be sized and previewer can be enabled and disabledEvgeny Fadeev2012-05-066-187/+296
| * | | moved group wiki to the sidebar and made join/leave group button workEvgeny Fadeev2012-05-0510-55/+263
| * | | started working on allowing people to join some groups without administrators...Evgeny Fadeev2012-05-033-1/+362
| * | | fix to asking by email and another one to prevent creation of "blank" tagsEvgeny Fadeev2012-05-022-4/+6
| * | | allowed admins to decide whether to moderate email posted to groupsEvgeny Fadeev2012-05-0113-14/+438
| * | | added group email address, enabled by defaultEvgeny Fadeev2012-05-012-5/+24
| * | | group logos show in the user profile pagesEvgeny Fadeev2012-05-0112-32/+87
| * | | Merge branch 'master' into user-groupsEvgeny Fadeev2012-05-012-2/+2
| |\ \ \
| * | | | renamed PostRejectReason to PostFlagReason and merged two short model files i...Evgeny Fadeev2012-05-019-133/+123
| * | | | deleted an unused fileEvgeny Fadeev2012-05-012-255/+2
| * | | | fixed a small bug in the modal dialogEvgeny Fadeev2012-04-302-1/+2
| * | | | almost finished the post reject reasons dialog and the moderation featureEvgeny Fadeev2012-04-3016-82/+1197
| * | | | started working on a menu for rejecting the postEvgeny Fadeev2012-04-273-88/+143
| * | | | improved the tag wiki editor and made the WMD editor and the previewer work f...Evgeny Fadeev2012-04-2510-63/+212
| * | | | refactored WMD() class and its usage patternEvgeny Fadeev2012-04-225-33/+51
| * | | | merged the master branchEvgeny Fadeev2012-04-226-7/+32
| |\ \ \ \
| * | | | | part way through implemented post reject reasons in the moderation viewEvgeny Fadeev2012-04-203-14/+86
| * | | | | fixed abug where upon asking with moderation on there was an exceptionEvgeny Fadeev2012-04-201-0/+3