summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merged Dejan's management command for creating test dataEvgeny Fadeev2011-11-255-3/+4
* Merge branch 'dejan'Evgeny Fadeev2011-11-253-1/+231
|\
| * Removed unused imports in fill_test_content_db management commandDejan Noveski2011-11-241-2/+0
| * Accept a best answer at the endDejan Noveski2011-11-241-0/+7
| * Newline at EOF in fill_test_content_db.pyDejan Noveski2011-11-241-1/+1
| * Test data filler management command - fill_test_content_db added.Dejan Noveski2011-11-241-0/+223
| * Merge branch 'master' of git://github.com/ASKBOT/askbot-develDejan Noveski2011-11-232-1/+6
| |\
| * \ Merge branch 'master' of git://github.com/ASKBOT/askbot-develDejan Noveski2011-11-2156-3055/+10744
| |\ \
| * | | made a little change to experiment with the cacheEvgeny Fadeev2011-11-162-1/+3
| * | | Merge branch 'master' of https://github.com/ASKBOT/askbot-develDejan Noveski2011-11-169-9/+14
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/ASKBOT/askbot-develDejan Noveski2011-11-163-0/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/ASKBOT/askbot-develDejan Noveski2011-11-1623-17/+164
| |\ \ \ \ \
* | \ \ \ \ \ merged localization fixes for js by Rosandra, temp teleted some djangojs.mo f...Evgeny Fadeev2011-11-2533-944/+803
|\ \ \ \ \ \ \
| * | | | | | | removed uses of replace() for translations in js filesRosandra Cuello2011-11-2233-943/+803
* | | | | | | | added Jordi Bofill to the list of contributorsEvgeny Fadeev2011-11-252-0/+2
* | | | | | | | Merge branch 'jbofill'Evgeny Fadeev2011-11-254-0/+6591
|\ \ \ \ \ \ \ \
| * | | | | | | | catalan updateJordi Bofill2011-11-254-90/+89
| * | | | | | | | catalan updateJordi Bofill2011-11-251-75/+72
| * | | | | | | | continue translation catalanJordi Bofill2011-11-221-29/+33
| * | | | | | | | ca (catalan) translation startjordi2011-11-214-0/+6591
* | | | | | | | | updated changlog, contrib list and merged Italian locale update by Luca Ferro...Evgeny Fadeev2011-11-256-934/+935
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Refined locale updateLuca Ferroni2011-11-192-2/+2
| * | | | | | | | | Updated locale by RiccardoLuca Ferroni2011-11-191-229/+155
| * | | | | | | | | Some updates in locale translationLuca Ferroni2011-11-194-149/+127
| * | | | | | | | | Updated Italian locale fileLuca Ferroni2011-11-181-574/+669
* | | | | | | | | | added support for LOGIN_REDIRECT_URL to django_authopenid submoduleEvgeny Fadeev2011-11-256-34/+78
* | | | | | | | | | resolved edit conflict in the changelogEvgeny Fadeev2011-11-246-7/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | added Alexander's contribs to the changelogEvgeny Fadeev2011-11-242-3/+4
| * | | | | | | | | | Merge branch 'master' of git://github.com/ASKBOT/askbot-develAlexander Werner2011-11-232-1/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' of git://github.com/ASKBOT/askbot-develAlexander Werner2011-11-2152-3021/+10695
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Using plainto_tsquery instead of to_tsquery allows special characters in searchAlexander Werner2011-11-191-2/+2
| * | | | | | | | | | Prefer request.LANGUAGE_CODE over settings.LANGUAGE_CODE if availableAlexander Werner2011-11-182-2/+4
| * | | | | | | | | | Reintroduced limit to rss feed length (lost in commit 54c4083)Alexander Werner2011-11-181-1/+1
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | wrote separate test cases for ask page, b/c access depends on setting ALLOW_P...Evgeny Fadeev2011-11-241-4/+16
* | | | | | | | | | added private forum mode feature to the changelogEvgeny Fadeev2011-11-241-0/+1
* | | | | | | | | | some style changes to display the header correctly and added optional setting...Evgeny Fadeev2011-11-245-8/+14
* | | | | | | | | | Merge branch 'master' into vlad111Evgeny Fadeev2011-11-242-1/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | fixed position of the question subscribe checkbox and disabled anonymous cach...Evgeny Fadeev2011-11-222-1/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | removed use of undefined search state in ask viewEvgeny Fadeev2011-11-241-1/+1
* | | | | | | | | made some changes in the setup templates, startup scripts and test cases - st...Evgeny Fadeev2011-11-225-7/+9
* | | | | | | | | Merge branch 'tmp' into vlad111Evgeny Fadeev2011-11-22178-3303/+14669
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Feature #111: improvements in CLOSED MODEVlad Bokov2011-11-228-62/+244
| * | | | | | | | | Merge branch 'master' into R111_closed_forum_modeVlad Bokov2011-11-22172-3241/+14425
| |\| | | | | | | |
| | * | | | | | | | Merge branch 'adolfo'Evgeny Fadeev2011-11-2151-3019/+10682
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | style changes and todo commentsEvgeny Fadeev2011-11-208-15/+18
| | | * | | | | | | Send Email Command Feature 131(cherry picked and pylinted)dm035142011-11-181-0/+24
| | | * | | | | | | Fixed a bug in question follow bug due to bad translationAdolfo Fitoria2011-11-173-2/+2
| | | * | | | | | | fixed css bug for search barAdolfo Fitoria2011-11-172-3/+6
| | | * | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-11-174-34/+49
| | | |\| | | | | |
| | | * | | | | | | updated changelog and added Rosandra to contributorsAdolfo Fitoria2011-11-172-0/+2