summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-07-2510-14/+54
|\
| * made send unaswered reminders group-awareEvgeny Fadeev2012-07-251-0/+4
| * made it hopefully impossible to add blank tagsEvgeny Fadeev2012-07-242-0/+10
| * added locally stored OpenSans web fontEvgeny Fadeev2012-07-244-14/+2
| * added a more meaningful screen to an error caused by a django import errorEvgeny Fadeev2012-07-242-0/+33
| * fixed migration 124 for transactional databasesEvgeny Fadeev2012-07-231-0/+5
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-07-2316-244/+505
|\|
| * updated documentation for the ALLOW_UNICODE_SLUGS settingEvgeny Fadeev2012-07-225-21/+69
| * some PEP8 treatment to a couple of filesEvgeny Fadeev2012-07-212-193/+343
| * added option to limit one answer per question per personEvgeny Fadeev2012-07-189-8/+68
| * transplanted an search input autofocusing fix from tag-editor branch and isol...Evgeny Fadeev2012-07-181-22/+25
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-07-177-56/+84
|\|
| * made high reputation users be able to reopen questionsEvgeny Fadeev2012-07-172-5/+19
| * fixed media reference in the post revision pageEvgeny Fadeev2012-07-172-10/+13
| * restored ability to comment and vote on closed questions and removed width fr...Evgeny Fadeev2012-07-163-37/+37
| * filtered out blocked users from receiving instant notificationsEvgeny Fadeev2012-07-161-0/+4
| * adjusted style for the list of related questionsEvgeny Fadeev2012-07-161-4/+11
* | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-07-1612-168/+154
|\|
| * recompiled style.cssEvgeny Fadeev2012-07-161-77/+78
| * width of ask button == width of sidebarEvgeny Fadeev2012-07-161-1/+1
| * a bug fix on listing users by group and some style adjustmentsEvgeny Fadeev2012-07-163-21/+17
| * merged Adolfo's build_livesettings_cache management commandEvgeny Fadeev2012-07-164-3/+7
| * Merge branch 'livesettings_fix'Evgeny Fadeev2012-07-165-21/+58
| |\
| * | first pass on switching fro Yanone Kaffeesatz to Open Sans CondensedEvgeny Fadeev2012-07-153-43/+44
| * | fixed the broken "follow user" functionEvgeny Fadeev2012-07-151-19/+2
| * | fixed display glitch in the closed questionEvgeny Fadeev2012-07-143-7/+8
* | | Merge branch 'master' into livesettings_fixAdolfo Fitoria2012-07-13112-3171/+4349
|\| | | |/ |/|
| * renamed function users() --> show_users()Evgeny Fadeev2012-07-012-3/+3
| * Merge pull request #86 from dkolak/fix_tplEvgeny Fadeev2012-06-301-1/+1
| |\
| | * small template fixDario Kolak2012-07-011-1/+1
| |/
| * Update masterEvgeny Fadeev2012-06-301-1/+1
| * Merge pull request #82 from lissyx/masterEvgeny Fadeev2012-06-271-4/+4
| |\
| | * fix: Locale might break JavaScript codelissyx2012-06-271-4/+4
| |/
| * tiny change in ru localeEvgeny Fadeev2012-06-161-1/+1
| * fixed import error bug in readers.pyEvgeny Fadeev2012-06-161-0/+1
| * small tweaks in content cleaningEvgeny Fadeev2012-06-162-3/+4
| * Merge branch 'github-master'Evgeny Fadeev2012-06-162-2012/+792
| |\
| | * Merge pull request #80 from lissyx/masterEvgeny Fadeev2012-06-162-2012/+792
| | |\
| | | * Rebuilt django.mo for french localelissyx2012-06-161-0/+0
| | | * l10n: french locales fix from goofy@lissyx2012-06-161-2012/+792
| * | | small changes in the skin and Ru localeEvgeny Fadeev2012-06-163-3/+5
| |/ /
| * | Merge branch 'github-master'Evgeny Fadeev2012-06-161-1/+1
| |\ \
| | * | Update masterEvgeny Fadeev2012-06-151-1/+1
| * | | added spammy to the test content set and protected code from such inputEvgeny Fadeev2012-06-1625-59/+71
| |/ /
| * | merged feature 157 by Paul BackhouseEvgeny Fadeev2012-06-1516-17/+456
| |\ \
| | * \ Merge branch 'master' into feature-157Paul Backhouse2012-05-057-10/+9
| | |\ \
| | * | | Fixed bug where clicking on a wildcard matched tag did not put the tag in the...Paul Backhouse2012-05-052-3/+4
| | * | | Now makes use of tag_selector.js, so wildcard tags can be expanded.Paul Backhouse2012-05-043-43/+34
| | * | | User profile has "Show tags" checkbox.Paul Backhouse2012-04-306-6/+595
| | * | | All users stored interesting/ignored tags are shown, without option to disabl...Paul Backhouse2012-04-302-3/+72