Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | temporarily disabled the language selector feature | Evgeny Fadeev | 2012-05-09 | 2 | -1/+3 |
| | |||||
* | made a "safe" version of setting update function | Evgeny Fadeev | 2012-05-09 | 2 | -23/+10 |
| | |||||
* | Merge branch 'master' of github.com:fitoria/askbot-devel | Adolfo Fitoria | 2012-05-08 | 12 | -120/+189 |
|\ | | | | | | | | | Conflicts: askbot/skins/utils.py | ||||
| * | error in merge | Adolfo Fitoria | 2012-05-02 | 1 | -4/+0 |
| | | |||||
| * | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-05-01 | 5 | -7/+6 |
| |\ | | | | | | | | | | | | | Conflicts: askbot/cron/askbot_cron_job | ||||
| * \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-30 | 3 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-23 | 5 | -31/+38 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/startup_procedures.py | ||||
| * \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-20 | 4 | -25/+29 |
| |\ \ \ \ | |||||
| * | | | | | 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 | ||||
| * \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-18 | 3 | -7/+11 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-17 | 2 | -15/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-16 | 14 | -62/+122 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 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 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Making the style of the buttons a css style standart easy to customize with less | Byron Corrales | 2012-02-22 | 4 | -3264/+105 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge branch 'askbot/master' | Byron Corrales | 2012-02-21 | 54 | -181/+623 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Ignoring .DS_Store files | Byron Corrales | 2012-02-21 | 1 | -0/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'cron-job-template' of git://github.com/robinst/askbot-devel ↵ | Adolfo Fitoria | 2012-04-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into merger | ||||
| | * | | | | | | | | | | | | | Fix paths in cronjob template file | Robin Stocker | 2012-04-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | added missing langs | Adolfo Fitoria | 2012-04-03 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | added language selection into livesettings, needs more testing | Adolfo Fitoria | 2012-04-03 | 5 | -9/+69 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-04-02 | 11 | -10/+20 |
| |\| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-03-20 | 15 | -52/+103 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-03-16 | 75 | -14564/+16873 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-03-06 | 4 | -7/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-03-05 | 35 | -308/+1707 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-03-01 | 136 | -5586/+31678 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-02-15 | 30 | -36/+196 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-02-10 | 16 | -29/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-02-08 | 4 | -4/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-02-03 | 6 | -685/+790 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-31 | 2 | -1/+23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-27 | 38 | -1071/+4671 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-26 | 5 | -0/+49 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-25 | 4 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-23 | 10 | -22/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/feed.py | ||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-20 | 178 | -5327/+23056 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: askbot/feed.py | ||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated feed class again | Adolfo Fitoria | 2012-01-19 | 1 | -10/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed feed issues with cache. | Adolfo Fitoria | 2012-01-19 | 2 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-16 | 21 | -93/+280 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-11 | 15 | -36/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-09 | 30 | -172/+204 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-05 | 43 | -24006/+44191 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-02 | 14 | -37/+182 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |