Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| | | * | | Merge branch 'new-template' of git://github.com/rosihorrorshow/askbot-devel ↵ | Adolfo Fitoria | 2011-11-17 | 40 | -341/+4927 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | into merger | ||||
| | | | * | | i18n.js messages moved to .po files | Rosandra Cuello | 2011-09-28 | 27 | -424/+492 |
| | | | | | | |||||
| | | | * | | properly internationalize javascript -- copied zh_CN tranlations from ↵ | Rosandra Cuello | 2011-09-28 | 23 | -346/+4864 |
| | | | | | | | | | | | | | | | | | | | | | | | | i18n.js, other languages remain | ||||
| | * | | | | fixed a bad condition that showed accepted arrow to everyone | Adolfo Fitoria | 2011-11-17 | 1 | -3/+3 |
| | |/ / / | |||||
| | * | | | renamed style.less.css to style.less | Adolfo Fitoria | 2011-11-16 | 2 | -1/+1 |
| | | | | | |||||
| | * | | | deleted duplicate in changelog | Adolfo Fitoria | 2011-11-16 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Added less compiled css for production mode | Adolfo Fitoria | 2011-11-16 | 4 | -2680/+5698 |
| | | | | | |||||
| | * | | | Merge branch 'master' into new-template | Adolfo Fitoria | 2011-11-16 | 43 | -55/+307 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/doc/source/changelog.rst | ||||
| | * \ \ \ | Merge branch 'master' into new-template | Adolfo Fitoria | 2011-11-08 | 41 | -345/+3151 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/doc/source/changelog.rst | ||||
| | * \ \ \ \ | Merge branch 'new-template' of github.com:ASKBOT/askbot-devel into new-template | Adolfo Fitoria | 2011-11-08 | 11 | -17/+99 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | * | | | | | Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into ↵ | Adolfo Fitoria | 2011-11-08 | 16 | -229/+385 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | new-template | ||||
| | * \ \ \ \ \ | Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into ↵ | Adolfo Fitoria | 2011-11-02 | 4 | -44/+72 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | new-template | ||||
| | * \ \ \ \ \ \ | Merge branch 'new-template' of github.com:ASKBOT/askbot-devel into new-template | Adolfo Fitoria | 2011-11-02 | 25 | -336/+464 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into ↵ | Adolfo Fitoria | 2011-10-26 | 13 | -255/+310 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new-template | ||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into ↵ | Adolfo Fitoria | 2011-10-24 | 16 | -438/+467 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new-template | ||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'new-template' of github.com:ASKBOT/askbot-devel into new-template | Adolfo Fitoria | 2011-10-24 | 2 | -20/+31 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into ↵ | Adolfo Fitoria | 2011-10-23 | 4 | -34/+47 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new-template | ||||
| | * | | | | | | | | | | | | temporal commit | Adolfo Fitoria | 2011-10-21 | 2 | -4/+18 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | added some comments in view question | Evgeny Fadeev | 2011-11-20 | 1 | -2/+13 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | separated cache tests into new file and disabled misc tests, whose purpose ↵ | Evgeny Fadeev | 2011-11-16 | 4 | -34/+49 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is unclear | ||||
| * | | | | | | | | | | | added awermer to contributors list and updated changelog | Adolfo Fitoria | 2011-11-16 | 2 | -0/+4 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added ASKBOT_TRANSLATE_URL setting | Alexander Werner | 2011-11-16 | 3 | -1/+7 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Removed fixed width of .tabBar to show it at correct width when searching | Alexander Werner | 2011-11-16 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Added directory entry for askbot/upfiles to .gitignore | Alexander Werner | 2011-11-16 | 1 | -5/+1 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed js bug reported in http://askbot.org/en/question/707/ | Alexander Werner | 2011-11-16 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Doesn't break current behaviour of opening social sharing sites in popup - Fallback to opening in current window if popup fails works again | ||||
| * | | | | | | | | | | | merged Dejans work on context-sensitive RSS url | Evgeny Fadeev | 2011-11-15 | 2 | -0/+2 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'dejan' | Evgeny Fadeev | 2011-11-15 | 5 | -6/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Updated live search to switch feed url, added comments - better code, ↵ | Dejan Noveski | 2011-11-15 | 3 | -11/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed unused import, querystring building moved further up to be used in AJAX response | ||||
| | * | | | | | | | | | | | RSS feed made context sensitive | Dejan Noveski | 2011-11-15 | 4 | -5/+34 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | added fancybox sources to the gitignore file | Evgeny Fadeev | 2011-11-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | fixed bug reported in http://askbot.org/en/question/699/bug-in-parser | Evgeny Fadeev | 2011-11-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | recompiled the translation messages | Evgeny Fadeev | 2011-11-11 | 15 | -0/+0 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | fixed german translation of to sign up with password | Evgeny Fadeev | 2011-11-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | 0050 migration fix - removed generic relations` migration | Tomasz Zielinski | 2011-11-11 | 2 | -16/+5 |
| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into wikipost | Tomasz Zielinski | 2011-11-11 | 5 | -16/+54 |
| |\| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | one more fix to the startup procedure for celery and incremented revision again | Evgeny Fadeev | 2011-11-09 | 2 | -2/+17 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | modified the startup_procedures message | Evgeny Fadeev | 2011-11-09 | 1 | -2/+4 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | merded Adolfos branch | Evgeny Fadeev | 2011-11-09 | 3 | -11/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | fixed celery startup_procedure test | Adolfo Fitoria | 2011-11-09 | 1 | -8/+18 |
| | | | | | | | | | | | | | |