summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixed css of the search barEvgeny Fadeev2013-03-235-611/+192
* fixed a failing testEvgeny Fadeev2013-03-231-1/+1
* merged with the master branchEvgeny Fadeev2013-03-2344-274/+494
|\
| * updated the contributors fileEvgeny Fadeev2013-03-221-0/+1
| * Merge pull request #118 from adobo/fixshareencodingEvgeny Fadeev2013-03-221-1/+1
| |\
| | * Fix encoding problems when sharing a question with special charactersJorge López Pérez2013-03-221-1/+1
| |/
| * allowed to enable and disable scopes on the main pageEvgeny Fadeev2013-03-2213-31/+161
| * Merge branch 'adolfo' into scopesEvgeny Fadeev2013-03-214-13/+24
| |\
| | * display error messages via exceptions on livesettingsAdolfo Fitoria2013-03-204-13/+24
| * | added setting to turn on and off selected scopes of questionsEvgeny Fadeev2013-03-211-0/+71
| |/
| * commented out the unnecessary settingEvgeny Fadeev2013-03-193-13/+2
| * Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-193-6/+11
| |\
| | * styling changes in the tag selector, added exception handling for skinEvgeny Fadeev2013-03-183-6/+11
| * | Merge branch 'master' of git://github.com/ASKBOT/askbot-develAdolfo Fitoria2013-03-1721-207/+250
| |\|
| | * unified css of buttonsEvgeny Fadeev2013-03-1720-199/+202
| * | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-144-5/+5
| |\ \
| * \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-1325-126/+148
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-1118-108/+1674
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-0717-94/+263
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-054-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-013-1/+502
| |\ \ \ \ \ \ \
| * | | | | | | | fixed typo en WYSIWYG editorAdolfo Fitoria2013-02-261-2/+2
| * | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-269-63/+6599
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-2518-60/+95
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | fixed django-tinymce versionAdolfo Fitoria2013-02-144-5/+5
| * | | | | | | | | | updated settings template and startup procedures to make tinymce workAdolfo Fitoria2013-02-144-14/+15
| * | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-140-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fixed import-data url in urls.pyAdolfo Fitoria2013-02-131-1/+1
| * | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-139-50/+115
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-0610-22/+1162
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | wrapping migration 0161 in try/except because of auth_user table modification"Adolfo Fitoria2013-02-041-3/+6
| * | | | | | | | | | | | | fixed logging formatingAdolfo Fitoria2013-02-041-1/+1
| * | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-011-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-313-9/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-2910-31/+70
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-2511-37/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-01-2121-99/+197
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | added ASKBOT_MULTILINGUAL to settings.py template, tests fails if this is not...Adolfo Fitoria2013-01-152-0/+9
* | | | | | | | | | | | | | | | | | | updated the changelogEvgeny Fadeev2013-03-231-0/+1
* | | | | | | | | | | | | | | | | | | better compress support on the main and question pagesEvgeny Fadeev2013-03-2313-129/+157
* | | | | | | | | | | | | | | | | | | some additional work on the compressor branchEvgeny Fadeev2013-03-235-19/+96
* | | | | | | | | | | | | | | | | | | Add django_compressor to compress CSS, JS and automatically compile LESSTyler Mandry2013-03-166-12/+34
* | | | | | | | | | | | | | | | | | | Add ability to use LESS development mode with extra.lessTyler Mandry2013-03-162-4/+11
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | recompiled the style.css fileEvgeny Fadeev2013-03-141-8/+48
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | changed the .org link to .com in the footerEvgeny Fadeev2013-03-131-1/+1
* | | | | | | | | | | | | | | | | a typo in the documentationEvgeny Fadeev2013-03-131-1/+1
* | | | | | | | | | | | | | | | | some bugfixesEvgeny Fadeev2013-03-112-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #96 from siovene/box-overflowEvgeny Fadeev2013-03-112-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Adds overflow:hidden to .box selector.Salvatore Iovene2012-11-032-0/+2
* | | | | | | | | | | | | | | | | Merge pull request #97 from siovene/conditional-sidebar-footerEvgeny Fadeev2013-03-111-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \