summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'evgeny' into byronAdolfo Fitoria2012-05-0876-28060/+40952
|\ | | | | | | | | | | Conflicts: askbot/cron/askbot_cron_job askbot/skins/default/media/style/style.css
| * Merge pull request #68 from jimt/patch-2Evgeny Fadeev2012-05-011-2/+2
| |\ | | | | | | badges template text cleanup
| | * badges template text cleanupJim Tittsler2012-04-231-2/+2
| | |
| * | Merge pull request #70 from jimt/patch-3Evgeny Fadeev2012-05-011-1/+0
| |\ \ | | | | | | | | remove duplicate label for subscribe (once you log in) checkbox
| | * | remove duplicate label for subscribe (once you log in) checkboxJim Tittsler2012-04-271-1/+0
| | |/
| * | Merge pull request #71 from jimt/patch-4Evgeny Fadeev2012-05-011-1/+1
| |\ \ | | | | | | | | correct path to manage.py
| | * | correct path to manage.pyJim Tittsler2012-04-271-1/+1
| | |/
| * | Merge pull request #72 from jimt/patch-5Evgeny Fadeev2012-05-011-1/+1
| |\ \ | | | | | | | | fix HREF= for "adjust" frequency of the email updates
| | * | fix HREF= for "adjust" frequency of the email updatesJim Tittsler2012-04-281-1/+1
| | |/
| * | Merge pull request #73 from jimt/patch-6Evgeny Fadeev2012-05-011-2/+2
| |\ \ | | | | | | | | typo/spelling; plural
| | * | typo/spelling; pluralJim Tittsler2012-05-011-2/+2
| |/ /
| * | fixed the cached_db setting for the SESSION_ENGINE setting that is commented outEvgeny Fadeev2012-04-292-2/+2
| | |
| * | fixed url on a badges pageEvgeny Fadeev2012-04-211-1/+1
| |/
| * updated changelogEvgeny Fadeev2012-04-211-0/+4
| |
| * added test for django-avatar, if avatar is in the INSTALLED_APPSEvgeny Fadeev2012-04-211-4/+19
| |
| * bumped versionEvgeny Fadeev2012-04-211-1/+1
| |
| * added a workaround for the "create_unique" bug in the South version 0.7.3Evgeny Fadeev2012-04-201-1/+6
| |
| * a patch to spaceless middleware submitted by MITx guysEvgeny Fadeev2012-04-201-0/+1
| |
| * fixed jquery-related bug where posting question was impossibleEvgeny Fadeev2012-04-201-1/+1
| |
| * upgraded askbot to jquery version 1.7.2Evgeny Fadeev2012-04-203-24/+28
| |
| * bumped versionEvgeny Fadeev2012-04-191-1/+1
| |
| * rebuilt locale files for the new releaseEvgeny Fadeev2012-04-1844-27930/+37275
| |
| * made a few messages extractable againEvgeny Fadeev2012-04-181-5/+5
| |
| * recompiled the style.css fileEvgeny Fadeev2012-04-181-71/+154
| |
| * fixed broken links on the revision pagesEvgeny Fadeev2012-04-171-1/+1
| |
| * fixed html formatting in the "embedding videos" setting description and ↵Evgeny Fadeev2012-04-172-6/+10
| | | | | | | | removed exceptions upon some incorrect url visits
| * hopefully fixed the caching issue of the question summary when an answer to ↵Evgeny Fadeev2012-04-172-15/+11
| | | | | | | | a question was deleted.
| * Merge branch 'github-master'Evgeny Fadeev2012-04-161-1/+1
| |\
| * | fixed urls from the tag cloudEvgeny Fadeev2012-04-155-5/+21
| | |
| * | added required setting RECAPTCHA_USE_SSL = TrueEvgeny Fadeev2012-04-153-0/+8
| | |
| * | removed empty box on the registration page when login buttons are disabledEvgeny Fadeev2012-04-154-55/+84
| | |
| * | changed the expander arrow style in the post revision pageEvgeny Fadeev2012-04-151-1/+1
| | |
| * | added "meta" class to the customized versions of the meta pagesEvgeny Fadeev2012-04-151-1/+8
| | |
* | | adding selector close, missing after mergeByron Corrales2012-04-082-2/+2
| | |
* | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-081-1/+1
|\ \ \ | | |/ | |/|
| * | Merge pull request #64 from robinst/email-recovery-case-insensitiveEvgeny Fadeev2012-04-051-1/+1
| |\ \ | | |/ | |/| AccountRecoveryForm: Search e-mail case-insensitive
| | * AccountRecoveryForm: Search e-mail case-insensitiveRobin Stocker2012-04-041-1/+1
| |/ | | | | | | | | E-mail addresses are usually treated as case-insensitive, so it makes sense to be lenient here.
* | Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into ↵Adolfo Fitoria2012-04-086-3266/+112
|\ \ | | | | | | | | | | | | | | | | | | byronmerge Conflicts: askbot/skins/default/media/style/style.less
| * | a little style fix of overlap when tags have big namesByron Corrales2012-03-012-2/+2
| | |
| * | Merge branch 'askbot/master'Byron Corrales2012-02-2381-4668/+30493
| |\ \
| * | | Fixing vote buttons position on IE browsersByron Corrales2012-02-233-2/+7
| | | |
| * | | Making the style of the buttons a css style standart easy to customize with lessByron Corrales2012-02-224-3264/+105
| | | |
| * | | Merge branch 'askbot/master'Byron Corrales2012-02-2154-181/+623
| |\ \ \
| * | | | Ignoring .DS_Store filesByron Corrales2012-02-211-0/+1
| | | | |
* | | | | Merge branch 'cron-job-template' of git://github.com/robinst/askbot-devel ↵Adolfo Fitoria2012-04-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into merger
| * | | | | Fix paths in cronjob template fileRobin Stocker2012-04-051-1/+1
| | |_|_|/ | |/| | |
* | | | | added missing langsAdolfo Fitoria2012-04-031-3/+5
| | | | |
* | | | | added language selection into livesettings, needs more testingAdolfo Fitoria2012-04-035-9/+69
| | | | |
* | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-0211-10/+20
|\| | | |
| * | | | incremented the revision for real and prepared for the releaseEvgeny Fadeev2012-03-293-1/+5
| | | | |