aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13496] Update calls to `set_config_count()`Gaëtan Muller2015-02-0220-67/+52
* Merge pull request #3280 from MGaetan89/ticket/13494Andreas Fischer2015-02-0245-183/+177
|\
| * [ticket/13494] Update calls to `set_config()`Gaëtan Muller2015-02-0245-183/+177
|/
* Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-012-1/+32
|\
| * Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-02-012-1/+32
| |\
| | * [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
| | * [prep-release-3.1.3] Update version to 3.1.3Joas Schilling2015-02-013-5/+5
* | | Merge pull request #3352 from VSEphpbb/ticket/10388Marc Alexander2015-01-315-7/+8
|\ \ \
| * | | [ticket/10388] Update deprecation commentMatt Friedman2015-01-311-1/+2
| * | | [ticket/10388] Update deprecation date for addslashesMatt Friedman2015-01-291-1/+1
| * | | [ticket/10388] Update testsMatt Friedman2015-01-291-1/+1
| * | | [ticket/10388] Use TWIG escape JS filter instead of addslashesMatt Friedman2015-01-292-5/+5
| * | | [ticket/10388] Convert LA usages to L when not in javascript contextMatt Friedman2015-01-292-2/+2
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-313-1/+48
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-315-5/+52
| |\ \ \ | | | |/ | | |/|
| | * | [prep-release-3.1.3] Add changelog for 3.1.3-RC2Joas Schilling2015-01-311-0/+15
| | * | [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
| | * | [prep-release-3.1.3] Update version to 3.1.3-RC2Joas Schilling2015-01-313-5/+5
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-7/+9
|\| | |
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-311-7/+9
| |\| |
| | * | Merge branch 'ticket/13553' into prep-release-3.1.3Joas Schilling2015-01-311-7/+9
| | |\ \
| | | * | [ticket/13553] Use defined title value in page headers tooMatt Friedman2015-01-311-1/+1
| | | * | [ticket/13553] Make title var accept a lang key varMatt Friedman2015-01-311-4/+4
| | | * | [ticket/13553] Message helper should accept a lang key varMatt Friedman2015-01-311-5/+7
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-312-0/+74
|\| | |
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-312-0/+74
| |\| |
| | * | Merge pull request #3355 from nickvergessen/ticket/13557Joas Schilling2015-01-312-0/+74
| | |\ \
| | | * | [ticket/13557] Add migrations for 3.0.13 and 3.0.13-PL1Joas Schilling2015-01-302-0/+74
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-5/+6
|\| | |
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusAndreas Fischer2015-01-302-5/+6
| |\| |
| | * | Merge pull request #3354 from nickvergessen/ticket/13556Andreas Fischer2015-01-302-5/+6
| | |\ \
| | | * | [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-301-1/+2
|\| | |
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusJoas Schilling2015-01-301-1/+2
| |\| |
| | * | Merge pull request #3341 from brunoais/ticket/13544Joas Schilling2015-01-301-1/+2
| | |\ \
| | | * | [ticket/13544] Use integer case because $role_id is an intbrunoais2015-01-261-1/+1
| | | * | [ticket/13544] Fixing wrong SQL query for permission_unset for rolesbrunoais2015-01-261-1/+2
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-300-0/+0
|\| | | |
| * | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-300-0/+0
| |\ \ \ \
| | * \ \ \ Merge branch 'prep-release-3.0.13' into develop-olympusAndreas Fischer2015-01-303-29/+39
| | |\ \ \ \
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-44/+52
|\| | | | | |
| * | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusAndreas Fischer2015-01-302-44/+52
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-303-45/+53
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | [prep-release-3.0.13] Correct changelog link to 3.0.13 changes.Andreas Fischer2015-01-301-2/+2
| | | * | | | [prep-release-3.0.13] Also update version in references to files.Andreas Fischer2015-01-291-3/+3
| | | * | | | [prep-release-3.0.13] Add changelog for 3.0.13-PL1 release.Andreas Fischer2015-01-291-0/+10
| | | * | | | [prep-release-3.0.13] Get rid of roman numbers in CHANGELOG.html.Andreas Fischer2015-01-291-24/+24
| | | * | | | [prep-release-3.0.13] Bump version numbers for 3.0.13-PL1 release.Andreas Fischer2015-01-294-6/+12
* | | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-305-42/+191
|\| | | | | |
| * | | | | | Merge branch 'prep-release-3.1.3' into develop-ascraeusDhruv2015-01-309-47/+196
| |\| | | | |