aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2015-02-011-0/+31
|\
| * [prep-release-3.1.3] Add migration for 3.1.3Joas Schilling2015-02-011-0/+31
* | Merge pull request #3352 from VSEphpbb/ticket/10388Marc Alexander2015-01-312-4/+5
|\ \
| * | [ticket/10388] Update deprecation commentMatt Friedman2015-01-311-1/+2
| * | [ticket/10388] Update deprecation date for addslashesMatt Friedman2015-01-291-1/+1
| * | [ticket/10388] Use TWIG escape JS filter instead of addslashesMatt Friedman2015-01-292-5/+5
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-311-0/+32
|\ \ \ | | |/ | |/|
| * | [prep-release-3.1.3] Add migration for 3.1.3-RC2Joas Schilling2015-01-311-0/+32
* | | Merge branch 'develop-ascraeus' into developJoas 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
|\ \ \ | |/ /
| * | [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
|\ \ \ | |/ /
| * | [ticket/13556] Fix exception translation with filedownloaderJoas Schilling2015-01-302-5/+6
* | | Merge branch 'develop-ascraeus' into developJoas 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 'prep-release-3.0.13' into prep-release-3.1.3Andreas Fischer2015-01-301-1/+1
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-302-1/+51
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'prep-release-3.1.3' into develop-ascraeusDhruv2015-01-302-1/+51
| |\ \ \ | | |/ /
| | * | [ticket/13553] Add a method to the controller helper to display a messageJoas Schilling2015-01-291-1/+16
| | * | [prep-release-3.1.3] Add migration for 3.1.3-RC1Joas Schilling2015-01-261-0/+35
| | |/
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-291-1/+1
|\ \ \ | |/ /
| * | Merge branch 'ticket/12933-olympus' into ticket/12933Dhruv2015-01-281-1/+1
| |/
* | [ticket/13468] Update calls to `add_log()`Gaëtan Muller2015-01-279-27/+38
* | Merge pull request #3179 from Nicofuma/ticket/13372Marc Alexander2015-01-241-28/+17
|\ \
| * | [ticket/13372] Fix require_once CSTristan Darricau2014-11-251-2/+2
| * | [ticket/13372] Fix Url Generator/Matcher generationTristan Darricau2014-11-251-28/+17
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2015-01-231-1/+9
|\ \ \ | | |/ | |/|
| * | Merge pull request #3321 from marc1706/ticket/13282Joas Schilling2015-01-231-1/+9
| |\ \
| | * | [ticket/13282] Use strpos() instead of preg_match()Marc Alexander2015-01-221-1/+1
| | * | [ticket/13282] Use 0 as default for integer type columns in postgresqlMarc Alexander2015-01-221-1/+9
* | | | Merge pull request #3275 from nickvergessen/ticket/13487Marc Alexander2015-01-221-0/+35
|\ \ \ \
| * | | | [ticket/13487] Add factory for db tool classJoas Schilling2015-01-101-0/+35
* | | | | Merge branch 'develop-ascraeus' into developNils Adermann2015-01-225-13/+199
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3173 from Nicofuma/ticket/13361Nils Adermann2015-01-225-13/+199
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/13361] Rename exception to runtime_exceptionTristan Darricau2015-01-212-4/+4
| | * | | [ticket/13361] Fix the JsonResponse in the exception listenerTristan Darricau2015-01-141-1/+1
| | * | | [ticket/13361] Add testsTristan Darricau2015-01-112-5/+11
| | * | | [ticket/13361] Support ajax request (send a json response)Tristan Darricau2015-01-101-9/+25
| | * | | [ticket/13361] Improve the exception listenerTristan Darricau2014-11-235-4/+168
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2015-01-211-0/+37
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-211-0/+37
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3314 from VSEphpbb/ticket/13133Tristan Darricau2015-01-201-4/+4
| |\ \ \ \
| | * | | | [ticket/13133] Fix variable name in set_custom_style()Matt Friedman2015-01-201-4/+4
* | | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2015-01-201-1/+1
|\ \ \ \ \ \ | |/ / / / /
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 19:09:13 +0000