summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* fixed bug in duplication of the moderation itemsEvgeny Fadeev2013-07-261-1/+1
|
* minor css and js adjustmentsEvgeny Fadeev2013-07-263-2/+37
|
* fixed html in the user->activity pageEvgeny Fadeev2013-07-251-2/+5
|
* Merge branch 'github'Evgeny Fadeev2013-07-2416-912/+920
|\
| * recompiled messagesEvgeny Fadeev2013-07-2216-912/+920
| |
* | small css changesEvgeny Fadeev2013-07-242-3/+3
|/
* fixed bug with css link typeEvgeny Fadeev2013-07-221-1/+4
|
* more or less finished api v1Evgeny Fadeev2013-07-213-13/+26
|
* made api more uniformEvgeny Fadeev2013-07-219-260/+284
|
* added url to ask form actionEvgeny Fadeev2013-07-191-1/+1
|
* removed duplication of two messages in js and templatesEvgeny Fadeev2013-07-192-2/+4
|
* Merge branch 'master' of github.com:ASKBOT/askbot-develEvgeny Fadeev2013-07-19145-14335/+15683
|\
| * recompiled messagesEvgeny Fadeev2013-07-17142-14335/+15683
| |
| * recompiled localesEvgeny Fadeev2013-07-173-0/+0
| |
* | small fix for the edit user profile pageEvgeny Fadeev2013-07-191-3/+3
|/
* updated pt_BR django.poEvgeny Fadeev2013-07-171-3494/+1294
|
* made timestamp show wider on user-> activity pageEvgeny Fadeev2013-07-142-2/+2
|
* css change on login pagesEvgeny Fadeev2013-07-142-21/+29
|
* Merge branch 'github'Evgeny Fadeev2013-07-143-10/+10
|\
| * Merge branch 'github'Evgeny Fadeev2013-07-142-21/+38
| |\
| * | fixed fix_answer_count and fix_question_count management commandsEvgeny Fadeev2013-07-143-10/+10
| | |
* | | fixed editor styling and allowed empty contents in question bodyEvgeny Fadeev2013-07-144-3/+9
| |/ |/|
* | Merge branch 'master' of github.com:ASKBOT/askbot-develEvgeny Fadeev2013-07-13151-26583/+22310
|\|
| * rebuilt english source localeEvgeny Fadeev2013-07-132-386/+427
| |
| * Merge branch 'pt-br'Evgeny Fadeev2013-07-134-1463/+3834
| |\
| | * updated the pt-br localeEvgeny Fadeev2013-07-131-3/+4
| | |
| | * recompiled pt_BR messagesEvgeny Fadeev2013-07-014-1463/+3833
| | |
| * | pulled localizations from tx and recompiledEvgeny Fadeev2013-07-13145-24734/+18049
| | |
* | | added style for Chinese localeEvgeny Fadeev2013-07-132-21/+38
|/ /
* | minor css changeEvgeny Fadeev2013-07-131-2/+3
| |
* | updated changelogEvgeny Fadeev2013-07-121-4/+5
| |
* | Merge branch 'github'Evgeny Fadeev2013-07-1223-90/+1043
|\ \
| * \ Merge branch 'master' of github.com:ASKBOT/askbot-devel into solrmultilangAdolfo Fitoria2013-07-128-90/+67
| |\ \
| * \ \ Merge branch 'master' of github.com:fitoria/askbot-devel into solrmultilangAdolfo Fitoria2013-07-110-0/+0
| |\ \ \
| | * \ \ Merge remote-tracking branch 'mainstream/master'Adolfo Fitoria2013-07-088-261/+125
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-07-0517-26/+126
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-07-0275-2440/+28752
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-06-2115-1352/+1574
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-06-1763-745/+3120
| | |\ \ \ \ \ \ \
| * | | | | | | | | fixes bug in management command and xml templateAdolfo Fitoria2013-07-112-1/+3
| | | | | | | | | |
| * | | | | | | | | fixes bug in startup testAdolfo Fitoria2013-07-111-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel into solrmultilangAdolfo Fitoria2013-07-10119-4190/+31473
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/doc/source/index.rst
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-devel into solrmultilangAdolfo Fitoria2013-06-1714-358/+1455
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' of github.com:fitoria/askbot-devel into solrmultilangAdolfo Fitoria2013-06-171-1/+2
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-05-2312-25/+69
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-05-21150-20780/+127507
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-05-153-31/+20
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-05-1414-25/+111
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-05-083-3/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-05-076-24/+44
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \