aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-2/+2
|\
| * Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympusAndreas Fischer2012-05-061-2/+2
| |\
| | * [ticket/10860] Fixing js error in updaterVjacheslav Trushkin2012-05-061-2/+2
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-13/+9
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'Noxwizard/ticket/10819' into develop-olympusAndreas Fischer2012-05-061-13/+9
| |\ \
| | * | [ticket/10819] Remove support for older browsersPatrick Webster2012-04-171-4/+0
| | * | [ticket/10819] Forgot this causes vertical scrollbars on IEPatrick Webster2012-04-151-1/+0
| | * | [ticket/10819] Improve side-by-side diff stylingPatrick Webster2012-04-151-13/+14
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-051-0/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10849' into develop-oly...Andreas Fischer2012-05-051-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/10849] Added missing helptext for listitemgalaxyAbstractor2012-04-271-0/+1
* | | | Merge remote-tracking branch 'brunoais/ticket/10871' into developAndreas Fischer2012-05-041-2/+0
|\ \ \ \
| * | | | [ticket/10871] Delete the unwanted implodeBruno Ais2012-05-041-2/+0
* | | | | Merge pull request #791 from erikfrerejean/task/10869Nils Adermann2012-05-031-1/+1
|\ \ \ \ \
| * | | | | [task/10869] Remove PHP 5.2 check from .travis.ymlErik Frèrejean2012-05-041-1/+1
|/ / / / /
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10818' into developAndreas Fischer2012-05-031-1/+1
|\ \ \ \ \
| * | | | | [ticket/10818] Global Announcements Update Dialog should call exit_handler()Joas Schilling2012-05-021-1/+1
|/ / / / /
* | | | | Merge remote-tracking branch 'mvinny/ticket/10778' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \
| * | | | | [ticket/10778] Remove extra space from close link in prosilver smilies windowVinny2012-05-011-1/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'Senky/ticket/10847' into developAndreas Fischer2012-05-016-6/+6
|\ \ \ \ \
| * | | | | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-306-6/+6
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympusAndreas Fischer2012-05-011-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/10846] fixing SQL query bug in acp_main.phpSenky2012-04-301-1/+1
| |/ / /
* | | | Merge PR #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-2630-144/+144
|\ \ \ \
| * | | | [ticket/10161] added fullstop to the end of sentenceSenky2012-04-261-1/+1
| * | | | [ticket/10161] coding-guidelines.html updatedSenky2012-04-261-1/+1
| * | | | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-1529-143/+143
* | | | | Merge PR #771 branch 'develop-olympus' into developOleg Pudeyev2012-04-262-2/+18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympusOleg Pudeyev2012-04-262-2/+18
| |\ \ \ \
| | * | | | [ticket/10836] Check if avatar directory is writable after installgalaxyAbstractor2012-04-251-0/+16
| | * | | | [ticket/10836] Enable avatars by default at installgalaxyAbstractor2012-04-211-2/+2
| |/ / / /
* | | | | Merge PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/10779] Move jQuery CDN option to Load SettingsMatt Friedman2012-04-101-2/+2
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-211-0/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'github-noxwizard/ticket/10492' into develop-oly...Nils Adermann2012-04-2111-64/+354
| |\ \ \ \
| | * | | | [ticket/10492] Fix line endingsPatrick Webster2012-04-211-26/+26
| | * | | | [ticket/10492] Backporting functional testsPatrick Webster2012-04-218-0/+251
| | * | | | [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-204-64/+103
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-201-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'github-dhruv/ticket/10815' into develop-olympusNils Adermann2012-04-201-1/+1
| |\ \ \ \
| | * | | | [ticket/10815] enables feed feature by default for a fresh installDhruv Goel2012-04-201-1/+1
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-201-4/+30
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'p/ticket/10767' into develop-olympusAndreas Fischer2012-04-201-4/+30
| |\ \ \ \ \
| | * | | | | [ticket/10767] Clarify what happens at the end of the hook.Oleg Pudeyev2012-04-171-1/+8
| | * | | | | [ticket/10767] Use warning/error language as appropriate.Oleg Pudeyev2012-04-171-1/+3
| | * | | | | [ticket/10767] Default to non-fatal behavior.Oleg Pudeyev2012-04-171-4/+6
| | * | | | | [ticket/10767] Revert unconditional unfatality in commit-msg hook.Oleg Pudeyev2012-04-161-3/+18
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-201-16/+19
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10812' into develop-oly...Andreas Fischer2012-04-201-16/+19
| |\ \ \ \ \