Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | Merge branch 'master' of https://github.com/ASKBOT/askbot-devel | Dejan Noveski | 2011-11-16 | 9 | -9/+14 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/ASKBOT/askbot-devel | Dejan Noveski | 2011-11-16 | 3 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/ASKBOT/askbot-devel | Dejan Noveski | 2011-11-16 | 23 | -17/+164 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | | | Moved all methods "shared" by Answer and Question models to Content | Tomasz Zielinski | 2011-11-26 | 3 | -297/+323 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Initial extraction of Question&Answer model methods to their common parent ↵ | Tomasz Zielinski | 2011-11-25 | 3 | -104/+114 | |
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | class Content | |||||
* | | | | | | | | | | | | Merge remote-tracking branch 'askbot/master' into wikipost | Tomasz Zielinski | 2011-11-25 | 47 | -1912/+8409 | |
|\| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | merged localization fixes for js by Rosandra, temp teleted some djangojs.mo ↵ | Evgeny Fadeev | 2011-11-25 | 33 | -944/+803 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files | |||||
| | * | | | | | | | | | | | removed uses of replace() for translations in js files | Rosandra Cuello | 2011-11-22 | 33 | -943/+803 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | added Jordi Bofill to the list of contributors | Evgeny Fadeev | 2011-11-25 | 2 | -0/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'jbofill' | Evgeny Fadeev | 2011-11-25 | 4 | -0/+6591 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | catalan update | Jordi Bofill | 2011-11-25 | 4 | -90/+89 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | catalan update | Jordi Bofill | 2011-11-25 | 1 | -75/+72 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | continue translation catalan | Jordi Bofill | 2011-11-22 | 1 | -29/+33 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | ca (catalan) translation start | jordi | 2011-11-21 | 4 | -0/+6591 | |
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | updated changlog, contrib list and merged Italian locale update by Luca ↵ | Evgeny Fadeev | 2011-11-25 | 6 | -934/+935 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ferroni, italian djangojs.mo temporarily deleted | |||||
| | * | | | | | | | | | | | | Refined locale update | Luca Ferroni | 2011-11-19 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Updated locale by Riccardo | Luca Ferroni | 2011-11-19 | 1 | -229/+155 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Some updates in locale translation | Luca Ferroni | 2011-11-19 | 4 | -149/+127 | |
| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | Updated Italian locale file | Luca Ferroni | 2011-11-18 | 1 | -574/+669 | |
| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | added support for LOGIN_REDIRECT_URL to django_authopenid submodule | Evgeny Fadeev | 2011-11-25 | 6 | -34/+78 | |
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Fixed a problem with ContentTypes changing their ID-s between views/users.py ↵ | Tomasz Zielinski | 2011-11-25 | 1 | -30/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialiation and running tests | |||||
* | | | | | | | | | | | | | Removed ipdb.set_trace | Tomasz Zielinski | 2011-11-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Added the missing PostRevision test | Tomasz Zielinski | 2011-11-24 | 3 | -5/+11 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | resolved edit conflict in the changelog | Evgeny Fadeev | 2011-11-24 | 6 | -7/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | added Alexander's contribs to the changelog | Evgeny Fadeev | 2011-11-24 | 2 | -3/+4 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of git://github.com/ASKBOT/askbot-devel | Alexander Werner | 2011-11-23 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'master' of git://github.com/ASKBOT/askbot-devel | Alexander Werner | 2011-11-21 | 52 | -3021/+10695 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Using plainto_tsquery instead of to_tsquery allows special characters in search | Alexander Werner | 2011-11-19 | 1 | -2/+2 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Prefer request.LANGUAGE_CODE over settings.LANGUAGE_CODE if available | Alexander Werner | 2011-11-18 | 2 | -2/+4 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Reintroduced limit to rss feed length (lost in commit 54c4083) | Alexander Werner | 2011-11-18 | 1 | -1/+1 | |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | wrote separate test cases for ask page, b/c access depends on setting ↵ | Evgeny Fadeev | 2011-11-24 | 1 | -4/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ALLOW_POSTING_BEFORE_LOGGING_IN | |||||
* | | | | | | | | | | | | added private forum mode feature to the changelog | Evgeny Fadeev | 2011-11-24 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | some style changes to display the header correctly and added optional ↵ | Evgeny Fadeev | 2011-11-24 | 5 | -8/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting ASKBOT_CSS_DEVEL to the settings.py | |||||
* | | | | | | | | | | | | Merge branch 'master' into vlad111 | Evgeny Fadeev | 2011-11-24 | 2 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | fixed position of the question subscribe checkbox and disabled anonymous ↵ | Evgeny Fadeev | 2011-11-22 | 2 | -1/+6 | |
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caching of question page, because it does not work properly | |||||
* | | | | | | | | | | | removed use of undefined search state in ask view | Evgeny Fadeev | 2011-11-24 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | made some changes in the setup templates, startup scripts and test cases - ↵ | Evgeny Fadeev | 2011-11-22 | 5 | -7/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | still test cases fail | |||||
* | | | | | | | | | | | Merge branch 'tmp' into vlad111 | Evgeny Fadeev | 2011-11-22 | 178 | -3303/+14669 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Feature #111: improvements in CLOSED MODE | Vlad Bokov | 2011-11-22 | 8 | -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_mode | Vlad Bokov | 2011-11-22 | 172 | -3241/+14425 | |
| |\| | | | | | | | | | | ||||||
| | * | | | | | | | | | | Merge branch 'adolfo' | Evgeny Fadeev | 2011-11-21 | 51 | -3019/+10682 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | | style changes and todo comments | Evgeny Fadeev | 2011-11-20 | 8 | -15/+18 | |
| | | | |_|_|_|_|_|/ / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Send Email Command Feature 131(cherry picked and pylinted) | dm03514 | 2011-11-18 | 1 | -0/+24 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Fixed a bug in question follow bug due to bad translation | Adolfo Fitoria | 2011-11-17 | 3 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed message in template | |||||
| | | * | | | | | | | | fixed css bug for search bar | Adolfo Fitoria | 2011-11-17 | 2 | -3/+6 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2011-11-17 | 4 | -34/+49 | |
| | | |\| | | | | | | | ||||||
| | | * | | | | | | | | updated changelog and added Rosandra to contributors | Adolfo Fitoria | 2011-11-17 | 2 | -0/+2 | |
| | | | | | | | | | | | ||||||
| | | * | | | | | | | | Merge branch 'rosandra' | Adolfo Fitoria | 2011-11-17 | 42 | -336/+4934 | |
| | | |\ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | fixed issues with url translation an ASKBOT_TRANSLATE_URL setting | Adolfo Fitoria | 2011-11-17 | 2 | -1/+11 | |
| | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | fixed vote buttons js | Adolfo Fitoria | 2011-11-17 | 1 | -14/+16 | |
| | | | | | | | | | | | |