summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-139-50/+115
|\
| * css fixesEvgeny Fadeev2013-02-123-29/+94
| |
| * fixed bug where second and thereafter search tag could not be removedEvgeny Fadeev2013-02-121-1/+1
| |
| * made width 100% for the email alert templateEvgeny Fadeev2013-02-121-1/+1
| |
| * fixed retagging bug for django 1.3Evgeny Fadeev2013-02-124-19/+19
| |
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-0610-22/+1162
|\| | | | | | | | | Conflicts: askbot/migrations/0161_add_field__user_languages.py
| * improved behavior of the search barEvgeny Fadeev2013-02-061-4/+14
| |
| * edited the changelogEvgeny Fadeev2013-02-061-0/+8
| |
| * reordered startup testsEvgeny Fadeev2013-02-061-4/+4
| |
| * made test cases passEvgeny Fadeev2013-02-061-8/+13
| |
| * Merge branch 'master' into multilangEvgeny Fadeev2013-02-062-4/+7
| |\
| | * fixed age phrase on the user profileEvgeny Fadeev2013-02-061-1/+1
| | |
| | * fixed migration 0161 for brand new sitesEvgeny Fadeev2013-02-061-3/+6
| | |
| * | removed a duplicate migrationEvgeny Fadeev2013-02-061-391/+0
| | |
| * | multilingual search works for the Q&A contentEvgeny Fadeev2013-02-023-25/+827
| | |
| * | some work towards multilingual searchEvgeny Fadeev2013-02-014-4/+710
| |/
* | wrapping migration 0161 in try/except because of auth_user table modification"Adolfo Fitoria2013-02-041-3/+6
| |
* | fixed logging formatingAdolfo Fitoria2013-02-041-1/+1
| |
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-011-3/+0
|\|
| * Merge pull request #109 from amigrave/masterEvgeny Fadeev2013-01-311-3/+0
| |\ | | | | | | Removed 'debugger' statements
| | * Removed leftover 'debugger' statements in jsFabien Meghazi2013-01-311-3/+0
| |/
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-313-9/+16
|\|
| * fixed a bug in an error feedback on comment postingEvgeny Fadeev2013-01-311-1/+1
| |
| * adjusted template for teh email alertEvgeny Fadeev2013-01-291-7/+13
| |
| * fixed wrong user name on an error feedback related to accepting of best answerEvgeny Fadeev2013-01-291-1/+2
| |
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-2910-31/+70
|\|
| * bumped the release numberEvgeny Fadeev2013-01-292-3/+3
| |
| * moved question instructions above the ask form, added editable setting for ↵Evgeny Fadeev2013-01-295-22/+56
| | | | | | | | the instructions
| * added function "get_last_edited_date" to postsEvgeny Fadeev2013-01-281-0/+5
| |
| * escaped request.path in the urlsEvgeny Fadeev2013-01-253-6/+6
| |
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-2511-37/+57
|\|
| * added .all() method to the RelatedObjectSimulatorEvgeny Fadeev2013-01-241-0/+3
| |
| * fixed reputation bug on flagging postsEvgeny Fadeev2013-01-231-1/+1
| |
| * Merge branch 'github'Evgeny Fadeev2013-01-230-0/+0
| |\
| | * fixed default language on the ask page and made small css adjustmentsEvgeny Fadeev2013-01-233-9/+11
| | |
| * | fixed default language on the ask page and made small css adjustmentsEvgeny Fadeev2013-01-234-9/+13
| |/
| * fixed bug in get_absolute_url for post revision in the multilingual setupEvgeny Fadeev2013-01-222-2/+2
| |
| * fixed one bug in the language-specific search in the multilingual setupEvgeny Fadeev2013-01-221-2/+3
| |
| * fixed language parameter in the language navigationEvgeny Fadeev2013-01-221-2/+2
| |
| * small fixes in the user inboxEvgeny Fadeev2013-01-223-21/+25
| |
| * added a macro for country flagEvgeny Fadeev2013-01-201-0/+8
| |
* | 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.
| | * Fixed a settings manipulation that was breaking other tests.Rodrigo Daunoravicius2013-01-191-1/+4
| | | | | | | | | | | | | | | The manipulation of ASKBOT_EXTRA_SKINS was breaking widget_tests and post_model_tests when running the full askbot test suite.
| * | 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 ↵Adolfo Fitoria2013-01-152-0/+9
|/ | | | not present