summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into byr...Adolfo Fitoria2012-04-086-3266/+112
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | 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 int...Adolfo Fitoria2012-04-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | 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
| |\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-03-2015-52/+103
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-03-1675-14564/+16873
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-03-064-7/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-03-0535-308/+1707
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-03-01136-5586/+31678
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-02-1530-36/+196
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-02-1016-29/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-02-084-4/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-02-036-685/+790
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-312-1/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-2738-1071/+4671
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-265-0/+49
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-254-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-2310-22/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-20178-5327/+23056
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated feed class againAdolfo Fitoria2012-01-191-10/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed feed issues with cache.Adolfo Fitoria2012-01-192-15/+15
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-1621-93/+280
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-1115-36/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-0930-172/+204
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-0543-24006/+44191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-01-0214-37/+182
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2011-12-306-20/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error in mergeAdolfo Fitoria2012-05-080-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added fallback for update_media_revisionAdolfo Fitoria2012-05-081-8/+28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updated feed class againAdolfo Fitoria2012-05-081-10/+27
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed feed issues with cache.Adolfo Fitoria2012-05-082-15/+15
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #68 from jimt/patch-2Evgeny Fadeev2012-05-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) checkboxJim Tittsler2012-04-271-1/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #71 from jimt/patch-4Evgeny Fadeev2012-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 updatesJim Tittsler2012-04-281-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #73 from jimt/patch-6Evgeny Fadeev2012-05-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | typo/spelling; pluralJim Tittsler2012-05-011-2/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /