Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | 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 byr... | Adolfo Fitoria | 2012-04-08 | 6 | -3266/+112 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | 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 int... | Adolfo Fitoria | 2012-04-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2012-01-20 | 178 | -5327/+23056 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:ASKBOT/askbot-devel | Adolfo Fitoria | 2011-12-30 | 6 | -20/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error in merge | Adolfo Fitoria | 2012-05-08 | 0 | -0/+0 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added fallback for update_media_revision | Adolfo Fitoria | 2012-05-08 | 1 | -8/+28 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated feed class again | Adolfo Fitoria | 2012-05-08 | 1 | -10/+27 | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed feed issues with cache. | Adolfo Fitoria | 2012-05-08 | 2 | -15/+15 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #68 from jimt/patch-2 | Evgeny Fadeev | 2012-05-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | 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 | 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 | Jim Tittsler | 2012-05-01 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |