summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixed error messages display in feedback formAdolfo Fitoria2011-11-252-2/+13
* Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-11-2547-1912/+8409
|\
| * 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
* | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-11-2522-58/+328
|\| | | |
| * | | | 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
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | 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
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| * | / | | | | modified url in the closed mode test caseEvgeny Fadeev2011-11-061-1/+1
| |/ / / / / /
| * | | | | | Feature #111: some cleanupVlad Bokov2011-11-051-2/+0
| * | | | | | Feature #111: closed forum mode + testsVlad Bokov2011-11-055-1/+67
* | | | | | | changed truncate value to 20Adolfo Fitoria2011-11-241-1/+1
* | | | | | | Merge branch 'master' of git://github.com/byroncorrales/askbot-develAdolfo Fitoria2011-11-244-6/+24
|\ \ \ \ \ \ \
| * | | | | | | truncate strings lenght in widget tags listByron2011-11-231-1/+1
| * | | | | | | Style fix in sing up with passwordByron2011-11-234-6/+24
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-11-232-1/+6
|\| | | | | |
| * | | | | | fixed position of the question subscribe checkbox and disabled anonymous cach...Evgeny Fadeev2011-11-222-1/+6
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-11-228-15/+18
|\| | | | |
| * | | | | Merge branch 'adolfo'Evgeny Fadeev2011-11-2151-3019/+10682
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | style changes and todo commentsEvgeny Fadeev2011-11-208-15/+18
* | | | | | Added spam filtering with recaptcha in feedback formAdolfo Fitoria2011-11-213-22/+55
* | | | | | Fixes incorrect question numbering reported inAdolfo Fitoria2011-11-212-20/+40
* | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-11-211-2/+13
|\| | | | | | |/ / / / |/| | | |
| * | | | added some comments in view questionEvgeny Fadeev2011-11-201-2/+13
| | |/ / | |/| |
* | | | Send Email Command Feature 131(cherry picked and pylinted)dm035142011-11-181-0/+24