summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* forgot to include some files in the last commitAdolfo Fitoria2011-10-132-5/+60
|
* Added documentation for widgets and renamed a contributors_widget toAdolfo Fitoria2011-10-131-0/+0
| | | | contributors
* widgets for question pageAdolfo Fitoria2011-10-135-105/+108
|
* Created new widgets:Adolfo Fitoria2011-10-1311-46/+48
| | | | | | | | | | | - logo.html -> widget for logo. - ask_button.html -> widget for ask button - main_menu.html -> widget for the main menu. - meta_nav.html -> widget for meta navigation. - search_bar.html -> search bar widget. - user_navigation.html -> user navigation header Fixed a typo in secondary header.
* Merge branch 'new-template' into new-template-experimentalAdolfo Fitoria2011-10-1311-176/+203
|\
| * Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into ↵Adolfo Fitoria2011-10-1311-176/+203
| |\ | | | | | | | | | new-template
| | * Index question counter and votes boxes. Standardization of css names for id ↵Byron2011-10-1311-176/+203
| | | | | | | | | | | | and classes
| * | Merge branch 'master' into new-templateAdolfo Fitoria2011-10-1213-39/+65
| |\ \ | | |/ | |/|
* | | Merge branch 'master' into new-template-experimentalAdolfo 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 a bug in macrosAdolfo Fitoria2011-10-121-1/+1
| | | | | |
* | | | | | renamed tag_widget.html -> related_tags.htmlAdolfo Fitoria2011-10-122-1/+1
| | | | | |
* | | | | | renamed head -> html_headAdolfo Fitoria2011-10-124-3/+3
| | | | | |
* | | | | | Adding macros/utils_macros renamed old macros into new ones.Adolfo Fitoria2011-10-1211-135/+122
| | | | | |
* | | | | | deleted all the elements that already were migrated to user_macrosAdolfo Fitoria2011-10-121-128/+0
| | | | | |
* | | | | | Moved all user_macros TODO: delete the user macros from the mainAdolfo Fitoria2011-10-1212-19/+180
| | | | | | | | | | | | | | | | | | | | | | | | macrofile
* | | | | | moved macros to macros folderAdolfo Fitoria2011-10-1228-26/+26
| | | | | |
* | | | | | updated documentation for skin customizationAdolfo Fitoria2011-10-121-0/+90
| | | | | |
* | | | | | Merge branch 'new-template' into new-template-experimentalAdolfo Fitoria2011-10-122-1/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | fixed bug in forestyleAdolfo Fitoria2011-10-122-1/+1
| | | | | |
* | | | | | Deleting javascript files already present in common.Adolfo Fitoria2011-10-1129-17157/+0
| | | | | | | | | | | | | | | | | | | | | | | | Leaved some files because they can be modified according to template
* | | | | | Merge branch 'new-template' into new-template-experimentalAdolfo Fitoria2011-10-111-3/+3
|\| | | | |
| * | | | | fixed a bug in secondary headerAdolfo Fitoria2011-10-111-3/+3
| | | | | |
* | | | | | Deleted images/flags images/openid js/jquery-openid they will beAdolfo Fitoria2011-10-11294-485/+0
| | | | | | | | | | | | | | | | | | | | | | | | supported add the "common" template
* | | | | | moving all media to commonAdolfo Fitoria2011-10-1168-1/+3634
| | | | | |
* | | | | | Moved all the main_page/sidebar.html code into widgets, nowAdolfo Fitoria2011-10-114-32/+34
|/ / / / / | | | | | | | | | | | | | | | main_page/sidebar.html is just a layout container.
* | | | | 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
| |\| | | | | |_|/ | |/| |