summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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
* | 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
* | 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
|/
* Merge branch 'master' into new-templateAdolfo Fitoria2011-10-1085-31455/+56377
|\
| * 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 file...Evgeny Fadeev2011-10-071-1/+1
| | * | 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 ale...Evgeny Fadeev2011-10-063-11/+17
| * | | 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
| * | | | | 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 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
| * | | | | | Merge branch 'master' into feature83Adolfo Fitoria2011-10-058-5/+130
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' into feature83Adolfo Fitoria2011-10-0412-32/+174
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Changed the effect to be used with jquery.color.jsAdolfo Fitoria2011-10-033-9/+128
| * | | | | | Fixes(kind of): auto highlight #hash anchor on any urlAdolfo Fitoria2011-10-031-0/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'master' into new-templateAdolfo Fitoria2011-10-0610-12/+134
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |