summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
* | | | | | | | | | | | | Moved all methods "shared" by Answer and Question models to ContentTomasz Zielinski2011-11-263-297/+323
| | | | | | | | | | | | |
* | | | | | | | | | | | | Initial extraction of Question&Answer model methods to their common parent ↵Tomasz Zielinski2011-11-253-104/+114
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class Content
* | | | | | | | | | | | Merge remote-tracking branch 'askbot/master' into wikipostTomasz Zielinski2011-11-2547-1912/+8409
|\| | | | | | | | | | |
| * | | | | | | | | | | merged localization fixes for js by Rosandra, temp teleted some djangojs.mo ↵Evgeny Fadeev2011-11-2533-944/+803
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files
| | * | | | | | | | | | | 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 ↵Evgeny Fadeev2011-11-256-934/+935
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ferroni, italian djangojs.mo temporarily deleted
| | * | | | | | | | | | | | 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
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Fixed a problem with ContentTypes changing their ID-s between views/users.py ↵Tomasz Zielinski2011-11-251-30/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialiation and running tests
* | | | | | | | | | | | | Removed ipdb.set_traceTomasz Zielinski2011-11-241-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Added the missing PostRevision testTomasz Zielinski2011-11-243-5/+11
|/ / / / / / / / / / / /
* | | | | | | | | | | | 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 ↵Evgeny Fadeev2011-11-241-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALLOW_POSTING_BEFORE_LOGGING_IN
* | | | | | | | | | | | added private forum mode feature to the changelogEvgeny Fadeev2011-11-241-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | some style changes to display the header correctly and added optional ↵Evgeny Fadeev2011-11-245-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting ASKBOT_CSS_DEVEL to the settings.py
* | | | | | | | | | | | Merge branch 'master' into vlad111Evgeny Fadeev2011-11-242-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | fixed position of the question subscribe checkbox and disabled anonymous ↵Evgeny Fadeev2011-11-222-1/+6
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caching of question page, because it does not work properly
* | | | | | | | | | | 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 - ↵Evgeny Fadeev2011-11-225-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still test cases fail
* | | | | | | | | | | Merge branch 'tmp' into vlad111Evgeny Fadeev2011-11-22178-3303/+14669
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Feature #111: improvements in CLOSED MODEVlad Bokov2011-11-228-62/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - drop from django.conf.settings - make a separate group - make all views except askbot-related work - tests
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed message in template
| | | * | | | | | | | 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
| | | | | | | | | | |
| | | * | | | | | | | Merge branch 'rosandra'Adolfo Fitoria2011-11-1742-336/+4934
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | fixed issues with url translation an ASKBOT_TRANSLATE_URL settingAdolfo Fitoria2011-11-172-1/+11
| | | | | | | | | | | |
| | | | * | | | | | | | fixed vote buttons jsAdolfo Fitoria2011-11-171-14/+16
| | | | | | | | | | | |