summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | user groups are deletable, commit from the bus en route to CordobaEvgeny Fadeev2012-03-209-32/+186
| * | | | | | | | fixed a glitch where the first group could not be added to the user profileEvgeny Fadeev2012-03-201-2/+2
| * | | | | | | | assigning users to groups worksEvgeny Fadeev2012-03-2010-11/+89
| * | | | | | | | assigning users to groups about 2/3 way doneEvgeny Fadeev2012-03-1914-22/+574
* | | | | | | | | temporarily disabled the language selector featureEvgeny Fadeev2012-05-092-1/+3
* | | | | | | | | made a "safe" version of setting update functionEvgeny Fadeev2012-05-092-23/+10
* | | | | | | | | Merge branch 'master' of github.com:fitoria/askbot-develAdolfo Fitoria2012-05-0812-120/+189
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | error in mergeAdolfo Fitoria2012-05-021-4/+0
| * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-05-015-7/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-303-3/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-235-31/+38
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-204-25/+29
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | added fallback for update_media_revisionAdolfo Fitoria2012-04-191-3/+21
| * | | | | | | | | | Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-1946-27936/+40528
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-183-7/+11
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-172-15/+11
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:ASKBOT/askbot-develAdolfo Fitoria2012-04-1614-62/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | added South mysql test to startup proceduresAdolfo Fitoria2012-04-091-7/+28
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \