summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-2121-99/+197
|\
| * fixed some bugs in the UI of tags moderationEvgeny Fadeev2013-01-204-20/+28
| * fixed a bug in the content moderationEvgeny Fadeev2013-01-201-1/+1
| * Merge pull request #108 from rodelrod/fix-skin-testsEvgeny Fadeev2013-01-201-1/+4
| |\
| | * Fixed a settings manipulation that was breaking other tests.Rodrigo Daunoravicius2013-01-191-1/+4
| * | added hashtag option to the social sharing toolsEvgeny Fadeev2013-01-193-10/+37
| |/
| * made dropdown language navigationEvgeny Fadeev2013-01-178-25/+42
| * allowed change of language upon editing the questionEvgeny Fadeev2013-01-166-42/+85
* | added ASKBOT_MULTILINGUAL to settings.py template, tests fails if this is not...Adolfo Fitoria2013-01-152-0/+9
|/
* added language selector to the user profiles and to the ask question forEvgeny Fadeev2013-01-1413-51/+540
* Merge branch 'github-master'Evgeny Fadeev2013-01-141-11/+11
|\
| * fixed a bug in test cases for postgresqlEvgeny Fadeev2013-01-141-11/+11
* | small change in the startup procedureEvgeny Fadeev2013-01-141-7/+18
|/
* merged adolfos tag subscriptions featureEvgeny Fadeev2013-01-137-52/+98
* linking tag header to manage tag subscriptionAdolfo Fitoria2013-01-101-0/+5
* Merge branch 'master' into tag_subscriptionAdolfo Fitoria2013-01-102-0/+12
|\
| * fixed css issue with dropdown menu's z-indexAdolfo Fitoria2013-01-102-0/+12
* | changed migration number to merge master correctlyAdolfo Fitoria2013-01-101-0/+0
* | Merge branch 'master' into tag_subscriptionAdolfo Fitoria2013-01-1068-12465/+607
|\|
| * Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-1038-99/+115
| |\
| | * fixed an import errorEvgeny Fadeev2013-01-101-2/+2
| | * Merge branch 'master' of github.com:ASKBOT/askbot-develEvgeny Fadeev2013-01-1038-96/+112
| | |\
| | | * brokenEvgeny Fadeev2013-01-0938-96/+112
| | * | fixed a bug in the answer postingEvgeny Fadeev2013-01-081-1/+1
| | |/
| * | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-0784-12473/+599
| |\|
| | * added tests for multilingual site to the startup proceduresEvgeny Fadeev2013-01-061-0/+18
| | * added basic support for multilingual contentEvgeny Fadeev2013-01-0674-12447/+518
| | * added basic language navigation menuEvgeny Fadeev2013-01-045-0/+32
| | * made vote url work with the multilingual setupEvgeny Fadeev2013-01-036-26/+31
* | | adding styles to the templatesAdolfo Fitoria2013-01-095-22/+81
* | | added testcaseAdolfo Fitoria2013-01-093-7/+33
* | | modified test case that is not relevant anymore (auto tag deletion)Adolfo Fitoria2013-01-091-2/+2
* | | uncommenting linesAdolfo Fitoria2013-01-081-5/+4
* | | added signal to add missing tag subscriptions to newly created usersAdolfo Fitoria2013-01-082-1/+14
* | | Merge branch 'tag_change' into tag_subscriptionAdolfo Fitoria2013-01-087-17/+89
|\ \ \
| * | | fixe js issue in tag_selector.jsAdolfo Fitoria2013-01-031-1/+3
| * | | allowing admins to add tag subscription in the user profileAdolfo Fitoria2013-01-032-7/+13
| * | | temporal commit: javascript issue in tag_selector.jsAdolfo Fitoria2013-01-035-1/+71
| * | | allowing zero used count for the tagsAdolfo Fitoria2013-01-031-9/+3
| |/ /
* | | Create, add, delete done.Adolfo Fitoria2013-01-085-23/+106
* | | temporal commit, some stuff is not yet doneAdolfo Fitoria2013-01-079-7/+609
|/ /
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-022-0/+10
|\|
| * updated changelogEvgeny Fadeev2012-12-291-0/+4
| * added RSS autodiscovery link to html headEvgeny Fadeev2012-12-291-0/+6
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-12-2622-2633/+1858
|\|
| * Merge branch 'github-master'Evgeny Fadeev2012-12-254-2478/+1667
| |\
| | * Merge pull request #107 from sk8erchoi/masterEvgeny Fadeev2012-12-254-2478/+1667
| | |\
| | | * Korean translationYong Choi2012-12-254-2478/+1667
| | |/
| * / made all test cases pass and small refactoring of the user activity pageEvgeny Fadeev2012-12-255-21/+49
| |/
| * whitespace changesEvgeny Fadeev2012-12-231-2/+6