summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into new-templateAdolfo Fitoria2011-10-1213-39/+65
|\
| * changed a message in startup procedures and .tx configurationEvgeny Fadeev2011-10-122-8/+8
| |
| * updated changelogEvgeny Fadeev2011-10-121-3/+3
| |
| * removed outdated reference to animate hash handlerEvgeny Fadeev2011-10-121-1/+0
| |
| * Merge branch 'feature76' into testEvgeny Fadeev2011-10-1274-31408/+56262
| |\
| | * Merge branch 'master' into feature76Adolfo Fitoria2011-10-1173-31414/+56236
| | |\ | | | | | | | | | | | | | | | | Conflicts: askbot/skins/default/templates/main_page/javascript.html
| | * | Fixes: feature 76 http://bugs.askbot.org/issues/76Adolfo Fitoria2011-10-112-2/+3
| | | |
| | * | temporal and buggy commitAdolfo Fitoria2011-10-073-5/+4
| | | |
| | * | reading all questions at onceAdolfo Fitoria2011-10-073-12/+21
| | | |
| | * | added support for caching question titlesAdolfo Fitoria2011-10-071-1/+1
| | | |
| | * | Merge branch 'master' into feature76Adolfo Fitoria2011-10-075-15/+18
| | |\ \
| | * | | temporalAdolfo Fitoria2011-10-074-2/+27
| | | | |
| * | | | updated changelog with new featuresEvgeny Fadeev2011-10-121-0/+7
| | | | |
| * | | | Merge branch 'feature73'Evgeny Fadeev2011-10-1210-33/+111
| |\ \ \ \
| | * | | | fixed management_command_test according to changes in feature73Adolfo Fitoria2011-10-111-1/+0
| | | | | |
| | * | | | fixed exception, but still have failure of test case ↵Evgeny Fadeev2011-10-072-19/+7
| | | | | | | | | | | | | | | | | | | | | | | | askbot.tests.ManagementCommandTests
| | * | | | fixed bug produced by formAdolfo Fitoria2011-10-071-2/+1
| | |/ / /
* | | | | fixed bug in forestyleAdolfo Fitoria2011-10-122-1/+1
| | | | |
* | | | | fixed a bug in secondary headerAdolfo Fitoria2011-10-111-3/+3
| | | | |
* | | | | Merge branch 'master' into new-templateAdolfo Fitoria2011-10-1085-31455/+56377
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: askbot/locale/es/LC_MESSAGES/django.po
| * | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-10-1068-31400/+56220
| |\ \ \ \
| | * | | | Merge branch 'github-master'Evgeny Fadeev2011-10-087-2/+33
| | |\| | |
| | * | | | rebuilt askbot localesEvgeny Fadeev2011-10-0868-31400/+56220
| | | | | |
| * | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-10-075-14/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | updated the changelogEvgeny Fadeev2011-10-071-0/+1
| | | | |
| | * | | moved animateHashes() to utils.jsEvgeny Fadeev2011-10-074-14/+15
| | | | |
| | * | | Merge branch 'feature83'Evgeny Fadeev2011-10-075-2/+31
| | |\ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-10-075-15/+18
| |\| | | | | |_|/ | |/| |
| | * | fixed tag rendering bug in operaEvgeny Fadeev2011-10-072-1/+105
| | | |
| | * | moved "exclude db" statement in the MANIFEST.in up, so that the empty db ↵Evgeny Fadeev2011-10-071-1/+1
| | | | | | | | | | | | | | | | file is not included into the distribution
| | * | fixed the duplicate menttion&response in the inbox bug102Evgeny Fadeev2011-10-071-9/+7
| | | |
| | * | moved mention savings to the celery job and now many test cases for email ↵Evgeny Fadeev2011-10-063-11/+17
| | | | | | | | | | | | | | | | alerts fail
| * | | Merge branch 'feature73'Adolfo Fitoria2011-10-075-26/+100
| |\ \ \
| | * | | Merge branch 'master' into feature73Adolfo Fitoria2011-10-063-5/+6
| | |\| |
| | * | | Merge branch 'master' into feature73Adolfo Fitoria2011-10-058-5/+129
| | |\ \ \
| | * | | | Fixes issue 73: Added entries into livesettings, modified tests to makeAdolfo Fitoria2011-10-055-26/+100
| | | | | | | | | | | | | | | | | | | | | | | | it work.
| * | | | | Merge branch 'master' into bug97Adolfo Fitoria2011-10-0715-12/+271
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' into bug97Adolfo Fitoria2011-10-0412-32/+174
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | deleted pdb statementsAdolfo Fitoria2011-10-031-2/+0
| | | | | |
| * | | | | added startup testAdolfo Fitoria2011-10-031-0/+13
| | | | | |
| * | | | | Merge branch 'master' into bug97Adolfo Fitoria2011-10-032-7/+25
| |\ \ \ \ \
| * | | | | | Fixed bug 97: UserWarning: Cannot translate loaderAdolfo Fitoria2011-09-302-3/+10
| | | | | | |
* | | | | | | split html head into separate sub-templatesEvgeny Fadeev2011-10-074-34/+37
| | | | | | |
* | | | | | | Merge branch 'master' into new-templateAdolfo Fitoria2011-10-066-2/+136
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | fixed bugs with white colorAdolfo Fitoria2011-10-062-4/+8
| | | | | | |
| * | | | | | Changed answers permalink.Adolfo Fitoria2011-10-064-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added hash flashing support for questions
| * | | | | | added on hash change event, need to change all the hashing systemAdolfo Fitoria2011-10-061-15/+23
| | | | | | |
| * | | | | | Merge branch 'master' into feature83Adolfo Fitoria2011-10-067-136/+11
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | temporal: todo add alpha support for jquery.color.jsAdolfo Fitoria2011-10-054-7/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tested jquery.animate-colors. but it does not works on FF
| * | | | | | Merge branch 'master' into feature83Adolfo Fitoria2011-10-058-5/+130
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | Conflicts: askbot/skins/default/templates/question.html