summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Prevents sidebar footer from showing, if it's not defined.Salvatore Iovene2012-11-031-3/+5
| | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge pull request #106 from emonty/masterEvgeny Fadeev2013-03-1115-113/+101
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Fix fake migration errors so we can find the real ones.Monty Taylor2012-12-2413-105/+83
| | * | | | | | | | | | | | | | | | | | Make column changes actually work with InnoDBMonty Taylor2012-12-241-0/+5
| | * | | | | | | | | | | | | | | | | | Add MySQL support for safe_add_column.Monty Taylor2012-12-241-8/+13
| * | | | | | | | | | | | | | | | | | | Merge pull request #114 from tmandry/masterEvgeny Fadeev2013-03-111-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix bug causing askbot-setup script to never accept a sqlite filename.Tyler Mandry2013-03-101-0/+2
* | | | | | | | | | | | | | | | | | | | patched min search word length for japaneseEvgeny Fadeev2013-03-253-3/+13
* | | | | | | | | | | | | | | | | | | | added a hack for short japanese queriesEvgeny Fadeev2013-03-241-0/+5
* | | | | | | | | | | | | | | | | | | | merged with the master branchEvgeny Fadeev2013-03-1114-12/+1547
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | updated the changelog fileEvgeny Fadeev2013-03-111-0/+1
| * | | | | | | | | | | | | | | | | | | allowed to created tags upon subscribing to themEvgeny Fadeev2013-03-114-9/+32
| * | | | | | | | | | | | | | | | | | | disabled launchpad login by defaultEvgeny Fadeev2013-03-111-1/+5
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fixed some issues in postgres full text search and transferred "deleted" info...Evgeny Fadeev2013-03-106-2/+1500
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | added launchpad login as optionEvgeny Fadeev2013-03-094-0/+9
* | | | | | | | | | | | | | | | | | added minor edit function to the comment editsEvgeny Fadeev2013-03-097-9/+48
* | | | | | | | | | | | | | | | | | merged with the master branchEvgeny Fadeev2013-03-0810-110/+156
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | minor edit option for question and answer to suppress email alertsEvgeny Fadeev2013-03-088-91/+145
| * | | | | | | | | | | | | | | | | corrected check for anonymous user in the visit question taskEvgeny Fadeev2013-03-081-3/+4
| * | | | | | | | | | | | | | | | | fixed an exception with bad data on comment deleteEvgeny Fadeev2013-03-072-2/+14
| * | | | | | | | | | | | | | | | | fixed a bug where an invalid query parameter triggers exception on the questi...Evgeny Fadeev2013-03-072-10/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | fixed a pluralization bug in the timedelta displayEvgeny Fadeev2013-03-061-4/+6