aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2012-05-111-1/+1
|\
| * Merge remote-tracking branch 'github-bantu/ticket/10889' into develop-olympusNils Adermann2012-05-111-1/+1
| |\
| | * [ticket/10889] Make default value for c_char_size a CHAR(4) as defined.Andreas Fischer2012-05-111-1/+1
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-112-45/+100
|\ \ | |/
| * Merge remote-tracking branch 'p/ticket/10887' into develop-olympusAndreas Fischer2012-05-112-45/+100
| |\
| | * [ticket/10887] Add spaces.Oleg Pudeyev2012-05-111-1/+1
| | * [ticket/10887] Split auto increment test from db tools test.Oleg Pudeyev2012-05-102-45/+100
* | | Merge PR #785 branch 'develop-olympus' into developOleg Pudeyev2012-05-113-4/+5
|\ \ \ | |/ /
| * | Merge PR #785 branch 'Senky/ticket/10835' into develop-olympusOleg Pudeyev2012-05-113-4/+5
| |\ \ | | |/ | |/|
| | * [ticket/10835] changing "e-mail" to "email"Senky2012-05-111-1/+1
| | * [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entrySenky2012-05-071-1/+1
| | * [ticket/10835] fixing misleading message in UCPSenky2012-05-013-4/+5
* | | Merge PR #725 branch 'develop-olympus' into developOleg Pudeyev2012-05-101-4/+4
|\ \ \ | |/ /
| * | Merge PR #725 branch 'Senky/ticket/9896' into develop-olympusOleg Pudeyev2012-05-101-4/+4
| |\ \
| | * | [ticket/9896] Links changedSenky2012-05-101-5/+5
* | | | Merge PR #799 branch 'develop-olympus' into developOleg Pudeyev2012-05-109-94/+53
|\ \ \ \ | |/ / /
| * | | Merge PR #799 branch 'bantu/ticket/10881' into develop-olympusOleg Pudeyev2012-05-109-94/+53
| |\ \ \
| | * | | [ticket/10881] Replace old (and unify) file headers in develop files.Andreas Fischer2012-05-109-94/+53
| |/ / /
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-090-0/+0
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'p/ticket/10834' into develop-olympusAndreas Fischer2012-05-092-16/+21
| |\ \ \
| | * | | [ticket/10843] Backport changes to install language.Oleg Pudeyev2012-05-051-4/+4
| | * | | [ticket/10834] Backport general development language changes to 3.0.Oleg Pudeyev2012-05-051-12/+17
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-095-105/+70
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'Noxwizard/ticket/10858' into develop-olympusAndreas Fischer2012-05-095-104/+69
| |\ \ \ \
| | * | | | [ticket/10858] Move generic row seeking to DBALPatrick Webster2012-05-084-129/+43
| | * | | | [ticket/10858] Tests for row seeking with fetchfield()Patrick Webster2012-05-081-0/+26
| | * | | | [ticket/10858] Fix MSSQL Native's row seeking behaviorPatrick Webster2012-05-081-3/+28
| |/ / / /
* | | | | 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
| |\ \ \ \ \ | | |_|/ / / | |/| | | |