Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-05-01 | 5 | -7/+6 |
|\ | | | | | | | | | Conflicts: askbot/cron/askbot_cron_job | ||||
| * | Merge pull request #68 from jimt/patch-2 | Evgeny Fadeev | 2012-05-01 | 1 | -2/+2 |
| |\ | | | | | | | badges template text cleanup | ||||
| | * | badges template text cleanup | Jim Tittsler | 2012-04-23 | 1 | -2/+2 |
| | | | |||||
| * | | Merge pull request #70 from jimt/patch-3 | Evgeny Fadeev | 2012-05-01 | 1 | -1/+0 |
| |\ \ | | | | | | | | | remove duplicate label for subscribe (once you log in) checkbox | ||||
| | * | | remove duplicate label for subscribe (once you log in) checkbox | Jim Tittsler | 2012-04-27 | 1 | -1/+0 |
| | |/ | |||||
| * | | Merge pull request #71 from jimt/patch-4 | Evgeny Fadeev | 2012-05-01 | 1 | -1/+1 |
| |\ \ | | | | | | | | | correct path to manage.py | ||||
| | * | | correct path to manage.py | Jim Tittsler | 2012-04-27 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #72 from jimt/patch-5 | Evgeny Fadeev | 2012-05-01 | 1 | -1/+1 |
| |\ \ | | | | | | | | | fix HREF= for "adjust" frequency of the email updates | ||||
| | * | | fix HREF= for "adjust" frequency of the email updates | Jim Tittsler | 2012-04-28 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge pull request #73 from jimt/patch-6 | Evgeny Fadeev | 2012-05-01 | 1 | -2/+2 |
| |\ \ | | | | | | | | | typo/spelling; plural | ||||
| | * | | typo/spelling; plural | Jim Tittsler | 2012-05-01 | 1 | -2/+2 |
| |/ / | |||||
* | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-30 | 3 | -3/+3 |
|\| | | |||||
| * | | fixed the cached_db setting for the SESSION_ENGINE setting that is commented out | Evgeny Fadeev | 2012-04-29 | 2 | -2/+2 |
| | | | |||||
| * | | fixed url on a badges page | Evgeny Fadeev | 2012-04-21 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-23 | 5 | -31/+38 |
|\| | | | | | | | | | Conflicts: askbot/startup_procedures.py | ||||
| * | updated changelog | Evgeny Fadeev | 2012-04-21 | 1 | -0/+4 |
| | | |||||
| * | added test for django-avatar, if avatar is in the INSTALLED_APPS | Evgeny Fadeev | 2012-04-21 | 1 | -4/+19 |
| | | |||||
| * | bumped version | Evgeny Fadeev | 2012-04-21 | 1 | -1/+1 |
| | | |||||
| * | added a workaround for the "create_unique" bug in the South version 0.7.3 | Evgeny Fadeev | 2012-04-20 | 1 | -1/+6 |
| | | |||||
| * | a patch to spaceless middleware submitted by MITx guys | Evgeny Fadeev | 2012-04-20 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-20 | 4 | -25/+29 |
|\| | |||||
| * | fixed jquery-related bug where posting question was impossible | Evgeny Fadeev | 2012-04-20 | 1 | -1/+1 |
| | | |||||
| * | upgraded askbot to jquery version 1.7.2 | Evgeny Fadeev | 2012-04-20 | 3 | -24/+28 |
| | | |||||
| * | bumped version | Evgeny Fadeev | 2012-04-19 | 1 | -1/+1 |
| | | |||||
* | | added fallback for update_media_revision | Adolfo Fitoria | 2012-04-19 | 1 | -3/+21 |
| | | |||||
* | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-19 | 46 | -27936/+40528 |
|\| | | | | | | | | | Conflicts: askbot/skins/default/media/style/style.css | ||||
| * | rebuilt locale files for the new release | Evgeny Fadeev | 2012-04-18 | 44 | -27930/+37275 |
| | | |||||
| * | made a few messages extractable again | Evgeny Fadeev | 2012-04-18 | 1 | -5/+5 |
| | | |||||
| * | recompiled the style.css file | Evgeny Fadeev | 2012-04-18 | 1 | -71/+154 |
| | | |||||
* | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-18 | 3 | -7/+11 |
|\| | |||||
| * | fixed broken links on the revision pages | Evgeny Fadeev | 2012-04-17 | 1 | -1/+1 |
| | | |||||
| * | fixed html formatting in the "embedding videos" setting description and ↵ | Evgeny Fadeev | 2012-04-17 | 2 | -6/+10 |
| | | | | | | | | removed exceptions upon some incorrect url visits | ||||
* | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-17 | 2 | -15/+11 |
|\| | |||||
| * | hopefully fixed the caching issue of the question summary when an answer to ↵ | Evgeny Fadeev | 2012-04-17 | 2 | -15/+11 |
| | | | | | | | | a question was deleted. | ||||
* | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-16 | 14 | -62/+122 |
|\| | |||||
| * | Merge branch 'github-master' | Evgeny Fadeev | 2012-04-16 | 1 | -1/+1 |
| |\ | |||||
| * | | fixed urls from the tag cloud | Evgeny Fadeev | 2012-04-15 | 5 | -5/+21 |
| | | | |||||
| * | | added required setting RECAPTCHA_USE_SSL = True | Evgeny Fadeev | 2012-04-15 | 3 | -0/+8 |
| | | | |||||
| * | | removed empty box on the registration page when login buttons are disabled | Evgeny Fadeev | 2012-04-15 | 4 | -55/+84 |
| | | | |||||
| * | | changed the expander arrow style in the post revision page | Evgeny Fadeev | 2012-04-15 | 1 | -1/+1 |
| | | | |||||
| * | | added "meta" class to the customized versions of the meta pages | Evgeny Fadeev | 2012-04-15 | 1 | -1/+8 |
| | | | |||||
* | | | added South mysql test to startup procedures | Adolfo Fitoria | 2012-04-09 | 1 | -7/+28 |
| | | | |||||
* | | | adding selector close, missing after merge | Byron Corrales | 2012-04-08 | 2 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-08 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #64 from robinst/email-recovery-case-insensitive | Evgeny Fadeev | 2012-04-05 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | AccountRecoveryForm: Search e-mail case-insensitive | ||||
| | * | AccountRecoveryForm: Search e-mail case-insensitive | Robin Stocker | 2012-04-04 | 1 | -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 Fitoria | 2012-04-08 | 6 | -3266/+112 |
|\ \ | | | | | | | | | | | | | | | | | | | byronmerge Conflicts: askbot/skins/default/media/style/style.less | ||||
| * | | a little style fix of overlap when tags have big names | Byron Corrales | 2012-03-01 | 2 | -2/+2 |
| | | | |||||
| * | | Merge branch 'askbot/master' | Byron Corrales | 2012-02-23 | 81 | -4668/+30493 |
| |\ \ | |||||
| * | | | Fixing vote buttons position on IE browsers | Byron Corrales | 2012-02-23 | 3 | -2/+7 |
| | | | |