Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | Merge branch 'better-setup' | Adolfo Fitoria | 2011-11-09 | 2 | -5/+6 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | changed celery broker setting name | Adolfo Fitoria | 2011-10-21 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | Merge branch 'better-setup' of github.com:ASKBOT/askbot-devel into better-setup | Adolfo Fitoria | 2011-10-20 | 4 | -220/+217 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | added DOMAIN_NAME to settings | Adolfo Fitoria | 2011-10-20 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | | | | * | | | | | | | | | | | | Merge branch 'master' into better-setup | Adolfo Fitoria | 2011-10-20 | 26 | -42/+133 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | added CACHE_MIDDLEWARE_ANONYMOUS_ONLY setting and test, renamed ↵ | Evgeny Fadeev | 2011-11-09 | 5 | -4/+15 | |
| | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BROKER_BACKEND setting and fixed a bug in the answer vote button template | |||||
| | * | | | | | | | | | | | | | | | Added minor TODO comment in PostRevisionManager | Tomasz Zielinski | 2011-11-09 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Added test for the new wikipost models (only PostRevision at the moment) | Tomasz Zielinski | 2011-11-09 | 3 | -7/+73 | |
| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | Added misc tests; Fixed page load tests - still TODO: `./manage.py test ↵ | Tomasz Zielinski | 2011-11-09 | 3 | -3/+76 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | askbot.PageLoadTestCase` works great, whereas `./manage.py test askbot` breaks inside PageLoadTestCase - on checking the template used - it looks on the surface like some Jinja2 monkey-patching problem | |||||
| | * | | | | | | | | | | | | | | | Fixed migration 0050 so that Activities related to ↵ | Tomasz Zielinski | 2011-11-09 | 1 | -6/+22 | |
| | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QuestionRevision&AnswerRevisions are not lost | |||||
| | * | | | | | | | | | | | | | | incremented version | Evgeny Fadeev | 2011-11-08 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | |