Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | moved macros to macros folder | Adolfo Fitoria | 2011-10-12 | 28 | -26/+26 |
| | |||||
* | updated documentation for skin customization | Adolfo Fitoria | 2011-10-12 | 1 | -0/+90 |
| | |||||
* | Merge branch 'new-template' into new-template-experimental | Adolfo Fitoria | 2011-10-12 | 2 | -1/+1 |
|\ | |||||
| * | fixed bug in forestyle | Adolfo Fitoria | 2011-10-12 | 2 | -1/+1 |
| | | |||||
* | | Deleting javascript files already present in common. | Adolfo Fitoria | 2011-10-11 | 29 | -17157/+0 |
| | | | | | | | | Leaved some files because they can be modified according to template | ||||
* | | Merge branch 'new-template' into new-template-experimental | Adolfo Fitoria | 2011-10-11 | 1 | -3/+3 |
|\| | |||||
| * | fixed a bug in secondary header | Adolfo Fitoria | 2011-10-11 | 1 | -3/+3 |
| | | |||||
* | | Deleted images/flags images/openid js/jquery-openid they will be | Adolfo Fitoria | 2011-10-11 | 294 | -485/+0 |
| | | | | | | | | supported add the "common" template | ||||
* | | moving all media to common | Adolfo Fitoria | 2011-10-11 | 68 | -1/+3634 |
| | | |||||
* | | Moved all the main_page/sidebar.html code into widgets, now | Adolfo Fitoria | 2011-10-11 | 4 | -32/+34 |
|/ | | | | main_page/sidebar.html is just a layout container. | ||||
* | 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 | ||||
| * | | | | | | Merge branch 'master' into feature83 | Adolfo Fitoria | 2011-10-04 | 12 | -32/+174 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| * | | | | | | Changed the effect to be used with jquery.color.js | Adolfo Fitoria | 2011-10-03 | 3 | -9/+128 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed bug in jquery.color.js to make it work with askbot. | ||||
| * | | | | | | Fixes(kind of): auto highlight #hash anchor on any url | Adolfo Fitoria | 2011-10-03 | 1 | -0/+12 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | http://bugs.askbot.org/issues/83 | ||||
* | | | | | | Merge branch 'master' into new-template | Adolfo Fitoria | 2011-10-06 | 10 | -12/+134 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Conflicts: askbot/skins/default/media/style/style.css | ||||
| * | | | | | added db to .gitignore | Evgeny Fadeev | 2011-10-05 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | bumped version to 0.7.25 due to a bug not entirely fixed by 0.7.24 | Evgeny Fadeev | 2011-10-05 | 2 | -5/+5 |
| | |_|/ / | |/| | | | |||||
| * | | | | some changes to the bootstrap mode feature | Evgeny Fadeev | 2011-10-05 | 3 | -37/+59 |
| | | | | | |||||
| * | | | | Merge branch 'feature99' | Evgeny Fadeev | 2011-10-05 | 2 | -0/+73 |
| |\ \ \ \ | |||||
| | * | | | | do not overwrite settings in case that the value havent changed | Adolfo Fitoria | 2011-10-04 | 1 | -0/+5 |
| | | | | | |