summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-144-5/+5
|\
| * 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 branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-1325-126/+148
|\|
| * 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
| * | | | 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
* | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-1118-108/+1674
|\| | | |
| * | | | 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
| * | | 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
* | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-0717-94/+263
|\| | |
| * | | fixed a pluralization bug in the timedelta displayEvgeny Fadeev2013-03-061-4/+6
| * | | added function to repost answer as comment under the latest previously posted...Evgeny Fadeev2013-03-0616-90/+257
* | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-054-0/+4
|\| | |
| * | | added csrf cookie name to the contextEvgeny Fadeev2013-03-051-0/+1
| * | | a fix in the user tools navigation cssEvgeny Fadeev2013-03-043-0/+3
* | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-03-013-1/+502
|\| | |
| * | | restricted version of Django from aboveEvgeny Fadeev2013-02-281-1/+1
| * | | allowed search by email address in the user search barEvgeny Fadeev2013-02-262-0/+501
* | | | fixed typo en WYSIWYG editorAdolfo Fitoria2013-02-261-2/+2
* | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-269-63/+6599
|\| | |
| * | | added csrf protection to the widget formsEvgeny Fadeev2013-02-263-2/+5
| * | | Merge branch 'master' of github.com:ASKBOT/askbot-develEvgeny Fadeev2013-02-254-0/+6510
| |\ \ \
| | * \ \ Merge pull request #113 from dkolak/hr_transEvgeny Fadeev2013-02-254-0/+6510
| | |\ \ \
| | | * | | added croatian translationDario Kolak2013-02-254-0/+6510
| | |/ / /
| * / / / recompiled the css fileEvgeny Fadeev2013-02-252-61/+84
| |/ / /
* | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2013-02-2518-60/+95
|\| | |
| * | | updated js google code prettify and celery versionEvgeny Fadeev2013-02-243-39/+34
| * | | fixed a bug in the revisions page where wrong author was shown on the revisionsEvgeny Fadeev2013-02-221-1/+1
| * | | added 100% width on the email alert tableEvgeny Fadeev2013-02-221-1/+1
| * | | auto-enabled password login fields with LDAP onEvgeny Fadeev2013-02-211-1/+9
| * | | changed style of the notificationEvgeny Fadeev2013-02-212-0/+2
| * | | Merge branch 'github'Evgeny Fadeev2013-02-212-1/+1
| |\ \ \
| | * \ \ Merge pull request #112 from alexrudnick/unanswered_esEvgeny Fadeev2013-02-212-1/+1
| | |\ \ \
| | | * | | 'sin respuesta' is too long and breaks the layout for Spanish. Switch to 'nu...Alex Rudnick2013-02-212-1/+1