summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allowed to choose plain text or rich text editor for the commentsEvgeny Fadeev2013-04-0712-165/+282
|
* improved image and file upload menuesEvgeny Fadeev2013-04-036-67/+282
|
* minor css fixEvgeny Fadeev2013-04-011-0/+1
|
* a minor change in the search dropdownEvgeny Fadeev2013-04-012-1/+19
|
* added custom header to the search drop menu for japanese languageEvgeny Fadeev2013-04-012-0/+9
|
* some post-merge fixesEvgeny Fadeev2013-03-283-16/+20
|
* merged the master branchEvgeny Fadeev2013-03-2781-1201/+1285
|\
| * added signals answer_edited and answer_before_edit and setting ↵Evgeny Fadeev2013-03-272-9/+37
| | | | | | | | ASKBOT_EDIT_ANSWER_FORM
| * added an optional setting to pass extra context into the question pageEvgeny Fadeev2013-03-271-0/+9
| |
| * recompiled style.cssEvgeny Fadeev2013-03-261-1/+9
| |
| * added new_answer_posted signal and ASKBOT_NEW_ANSWER_FORM settings.py settingEvgeny Fadeev2013-03-262-1/+22
| |
| * created default filler for the "followed" scope when it is the only enabled ↵Evgeny Fadeev2013-03-264-4/+22
| | | | | | | | scope and added custom js placeholder for the question page
| * recompiled the style.cssEvgeny Fadeev2013-03-251-9/+27
| |
| * text/less -> text/cssEvgeny Fadeev2013-03-251-1/+1
| |
| * fixed a test caseEvgeny Fadeev2013-03-241-1/+1
| |
| * added option to disable the big ask buttonEvgeny Fadeev2013-03-249-122/+124
| |
| * recompiled the less fileEvgeny Fadeev2013-03-231-15/+25
| |
| * 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 characters
| | | * Fix encoding problems when sharing a question with special charactersJorge López Pérez2013-03-221-1/+1
| | |/ | | | | | | | | | escape() doesn't work with UTF-8 characters
| | * 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/migrations/0161_add_field__user_languages.py
| | * | | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \