Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into new-template | Adolfo Fitoria | 2011-10-12 | 13 | -39/+65 |
|\ | |||||
| * | changed a message in startup procedures and .tx configuration | Evgeny Fadeev | 2011-10-12 | 2 | -8/+8 |
| | | |||||
| * | updated changelog | Evgeny Fadeev | 2011-10-12 | 1 | -3/+3 |
| | | |||||
| * | removed outdated reference to animate hash handler | Evgeny Fadeev | 2011-10-12 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'feature76' into test | Evgeny Fadeev | 2011-10-12 | 74 | -31408/+56262 |
| |\ | |||||
| | * | Merge branch 'master' into feature76 | Adolfo Fitoria | 2011-10-11 | 73 | -31414/+56236 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: askbot/skins/default/templates/main_page/javascript.html | ||||
| | * | | Fixes: feature 76 http://bugs.askbot.org/issues/76 | Adolfo Fitoria | 2011-10-11 | 2 | -2/+3 |
| | | | | |||||
| | * | | temporal and buggy commit | Adolfo Fitoria | 2011-10-07 | 3 | -5/+4 |
| | | | | |||||
| | * | | reading all questions at once | Adolfo Fitoria | 2011-10-07 | 3 | -12/+21 |
| | | | | |||||
| | * | | added support for caching question titles | Adolfo Fitoria | 2011-10-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into feature76 | Adolfo Fitoria | 2011-10-07 | 5 | -15/+18 |
| | |\ \ | |||||
| | * | | | temporal | Adolfo Fitoria | 2011-10-07 | 4 | -2/+27 |
| | | | | | |||||
| * | | | | updated changelog with new features | Evgeny Fadeev | 2011-10-12 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Merge branch 'feature73' | Evgeny Fadeev | 2011-10-12 | 10 | -33/+111 |
| |\ \ \ \ | |||||
| | * | | | | fixed management_command_test according to changes in feature73 | Adolfo Fitoria | 2011-10-11 | 1 | -1/+0 |
| | | | | | | |||||
| | * | | | | fixed exception, but still have failure of test case ↵ | Evgeny Fadeev | 2011-10-07 | 2 | -19/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | askbot.tests.ManagementCommandTests | ||||
| | * | | | | fixed bug produced by form | Adolfo Fitoria | 2011-10-07 | 1 | -2/+1 |
| | |/ / / | |||||
* | | | | | fixed bug in forestyle | Adolfo Fitoria | 2011-10-12 | 2 | -1/+1 |
| | | | | | |||||
* | | | | | fixed a bug in secondary header | Adolfo Fitoria | 2011-10-11 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Merge branch 'master' into new-template | Adolfo Fitoria | 2011-10-10 | 85 | -31455/+56377 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: askbot/locale/es/LC_MESSAGES/django.po | ||||
| * | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2011-10-10 | 68 | -31400/+56220 |
| |\ \ \ \ | |||||
| | * | | | | Merge branch 'github-master' | Evgeny Fadeev | 2011-10-08 | 7 | -2/+33 |
| | |\| | | | |||||
| | * | | | | rebuilt askbot locales | Evgeny Fadeev | 2011-10-08 | 68 | -31400/+56220 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2011-10-07 | 5 | -14/+16 |
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | |||||
| | * | | | updated the changelog | Evgeny Fadeev | 2011-10-07 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | moved animateHashes() to utils.js | Evgeny Fadeev | 2011-10-07 | 4 | -14/+15 |
| | | | | | |||||
| | * | | | Merge branch 'feature83' | Evgeny Fadeev | 2011-10-07 | 5 | -2/+31 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| * | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2011-10-07 | 5 | -15/+18 |
| |\| | | | | |_|/ | |/| | | |||||
| | * | | fixed tag rendering bug in opera | Evgeny Fadeev | 2011-10-07 | 2 | -1/+105 |
| | | | | |||||
| | * | | moved "exclude db" statement in the MANIFEST.in up, so that the empty db ↵ | Evgeny Fadeev | 2011-10-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | file is not included into the distribution | ||||
| | * | | fixed the duplicate menttion&response in the inbox bug102 | Evgeny Fadeev | 2011-10-07 | 1 | -9/+7 |
| | | | | |||||
| | * | | moved mention savings to the celery job and now many test cases for email ↵ | Evgeny Fadeev | 2011-10-06 | 3 | -11/+17 |
| | | | | | | | | | | | | | | | | alerts fail | ||||
| * | | | Merge branch 'feature73' | Adolfo Fitoria | 2011-10-07 | 5 | -26/+100 |
| |\ \ \ | |||||
| | * | | | Merge branch 'master' into feature73 | Adolfo Fitoria | 2011-10-06 | 3 | -5/+6 |
| | |\| | | |||||
| | * | | | Merge branch 'master' into feature73 | Adolfo Fitoria | 2011-10-05 | 8 | -5/+129 |
| | |\ \ \ | |||||
| | * | | | | Fixes issue 73: Added entries into livesettings, modified tests to make | Adolfo Fitoria | 2011-10-05 | 5 | -26/+100 |
| | | | | | | | | | | | | | | | | | | | | | | | | it work. | ||||
| * | | | | | Merge branch 'master' into bug97 | Adolfo Fitoria | 2011-10-07 | 15 | -12/+271 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch 'master' into bug97 | Adolfo Fitoria | 2011-10-04 | 12 | -32/+174 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | deleted pdb statements | Adolfo Fitoria | 2011-10-03 | 1 | -2/+0 |
| | | | | | | |||||
| * | | | | | added startup test | Adolfo Fitoria | 2011-10-03 | 1 | -0/+13 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into bug97 | Adolfo Fitoria | 2011-10-03 | 2 | -7/+25 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fixed bug 97: UserWarning: Cannot translate loader | Adolfo Fitoria | 2011-09-30 | 2 | -3/+10 |
| | | | | | | | |||||
* | | | | | | | split html head into separate sub-templates | Evgeny Fadeev | 2011-10-07 | 4 | -34/+37 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' into new-template | Adolfo Fitoria | 2011-10-06 | 6 | -2/+136 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | fixed bugs with white color | Adolfo Fitoria | 2011-10-06 | 2 | -4/+8 |
| | | | | | | | |||||
| * | | | | | | Changed answers permalink. | Adolfo Fitoria | 2011-10-06 | 4 | -12/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added hash flashing support for questions | ||||
| * | | | | | | added on hash change event, need to change all the hashing system | Adolfo Fitoria | 2011-10-06 | 1 | -15/+23 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into feature83 | Adolfo Fitoria | 2011-10-06 | 7 | -136/+11 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | temporal: todo add alpha support for jquery.color.js | Adolfo Fitoria | 2011-10-05 | 4 | -7/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | tested jquery.animate-colors. but it does not works on FF | ||||
| * | | | | | | Merge branch 'master' into feature83 | Adolfo Fitoria | 2011-10-05 | 8 | -5/+130 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | Conflicts: askbot/skins/default/templates/question.html |