aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-2/+0
|\
| * Merge pull request #5607 from senky/ticket/15974Marc Alexander2019-06-031-2/+0
| |\
| | * [ticket/15974] Remove Back to previous page linkJakub Senko2019-05-271-2/+0
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-06-031-1/+5
|\ \ \ | |/ /
| * | Merge pull request #5613 from 3D-I/ticket/16071Marc Alexander2019-06-031-1/+5
| |\ \
| | * | [ticket/16071] Undefined index for custom attachments groups3D-I2019-05-291-1/+5
| |/ /
* | | Merge pull request #5614 from JoshyPHP/ticket/16072Marc Alexander2019-06-033-18/+57
|\ \ \
| * | | [ticket/16072] Update s9e/text-formatterJoshyPHP2019-05-313-18/+57
|/ / /
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-270-0/+0
|\ \ \ | |/ /
| * | Merge pull request #5592 from 3D-I/ticket/16055Marc Alexander2019-05-271-1/+1
| |\ \
| | * | [ticket/16055] Fix Oauth's redirects3D-I2019-05-161-1/+1
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-274-8/+40
|\ \ \ \ | |/ / /
| * | | Merge pull request #5593 from JoshyPHP/ticket/16053Marc Alexander2019-05-274-8/+40
| |\ \ \ | | |_|/ | |/| |
| | * | [ticket/16053] Update s9e/text-formatterJoshyPHP2019-05-174-8/+40
* | | | Merge pull request #5591 from rubencm/ticket/16057Marc Alexander2019-05-272-21/+8
|\ \ \ \
| * | | | [ticket/16057] Enable cgi.fix_pathinfo in php.inirubencm2019-05-171-3/+6
| * | | | [ticket/16057] Undo composer.json changesrubencm2019-05-152-2/+2
| * | | | [ticket/16057] Enable url rewrite and composer.json rulerubencm2019-05-153-2/+5
| * | | | [ticket/16057] Fix vagrant in 3.3rubencm2019-05-134-24/+5
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-231-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #5598 from marc1706/ticket/16067Marc Alexander2019-05-231-0/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/16067] Specify trusty build environmentMarc Alexander2019-05-231-0/+1
| |/ / /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #5587 from 3D-I/ticket/16048Marc Alexander2019-05-141-1/+1
| |\ \ \
| | * | | [ticket/16048] Fix restore backup from ACP3D-I2019-05-071-1/+1
| | | |/ | | |/|
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-141-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #5588 from rxu/ticket/16050Marc Alexander2019-05-141-1/+1
| |\ \ \
| | * | | [ticket/16050] Fix PHP warning in MCP Banning tab on PHP 7.2+rxu2019-05-111-1/+1
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-05-141-1/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #5590 from cclauss/patch-1Marc Alexander2019-05-141-1/+0
| |\ \ | | |/ | |/|
| | * [ticket/16058] Travis CI: "sudo: required" not longer iscclauss2019-05-131-1/+0
| |/
* | [ticket/16052] Update composer dependenciesMarc Alexander2019-05-121-806/+232
* | [ticket/16052] Add 3.3.0-dev migrationMarc Alexander2019-05-111-0/+36
* | [ticket/15927] Avoid using floatshanakin2019-05-111-6/+2
* | [ticket/15927] Fix render issuehanakin2019-05-112-9/+13
* | [ticket/15828] Do not allow PHP 7.3 tests to failMarc Alexander2019-05-111-3/+0
* | [ticket/16052] Update version numbers to 3.3Marc Alexander2019-05-1123-75/+75
* | [ticket/16052] Fix issues caused by mergesMarc Alexander2019-05-115-7/+7
* | [ticket/15369] Fix php_exporter testsMatt Friedman2019-05-101-7/+13
* | [ticket/15369] Fix testsMatt Friedman2019-05-102-2/+7
* | [ticket/15938] Update classes in backupStaticAttributesBlacklistMarc Alexander2019-05-092-8/+8
* | [ticket/14948] Remove checks for unsupported PHP versionsMarc Alexander2019-05-094-23/+6
* | [ticket/14948] Switch to VC15 where necessary for appveyor mssql driverMarc Alexander2019-05-091-2/+3
* | [ticket/14948] Use MSSQL 5.3.0 driver in appveyor buildsMarc Alexander2019-05-091-1/+1
* | [ticket/14948] Remove no longer needed or supported phpunit configsMarc Alexander2019-05-096-64/+9
* | [ticket/14948] Use new namespaced classes when generating mssql schemaMarc Alexander2019-05-091-5/+5
* | [ticket/14948] Require json extension in composer.jsonMarc Alexander2019-05-092-2/+4
* | [ticket/14948] Allow failures on PHP 7.3 until segfault is resolvedMarc Alexander2019-05-091-0/+1
* | [ticket/14948] Use continue 2 instead of continue to continue while loopMarc Alexander2019-05-091-2/+2
* | [ticket/14948] Remove mysql build as it's no longer supported in PHP >= 7.0Marc Alexander2019-05-091-2/+0