aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5793 from marc1706/ticket/16271Marc Alexander2019-12-2714-252/+442
|\ | | | | [ticket/16271] Add Sami 4.x and update necessary dependencies
| * [ticket/16271] Fix invalid docblocksMarc Alexander2019-12-2711-8/+18
| | | | | | | | PHPBB3-16271
| * [ticket/16271] Add Sami 4.x and update necessary dependenciesMarc Alexander2019-12-273-244/+424
| | | | | | | | PHPBB3-16271
* | Merge pull request #5788 from 3D-I/ticket/16221Marc Alexander2019-12-272-56/+72
|\ \ | | | | | | | | | [ticket/16221] Fix ACP statistics layout
| * | [ticket/16221] Fix ACP statistics layout3D-I2019-12-251-1/+1
| | | | | | | | | | | | | | | | | | Fix wide-screen layout PHPBB3-16221
| * | [ticket/16221] Fix ACP statistics layout3D-I2019-12-252-2/+8
| | | | | | | | | | | | | | | | | | Resolve conflicts PHPBB3-16221
| * | [ticket/16221] Fix ACP statistics layout3D-I2019-12-241-2/+2
| | | | | | | | | | | | PHPBB3-16221
| * | [ticket/16221] Fix ACP statistics layout3D-I2019-12-242-54/+64
| | | | | | | | | | | | PHPBB3-16221
* | | Merge pull request #5787 from 3D-I/ticket/16267Marc Alexander2019-12-271-1/+4
|\ \ \ | |_|/ |/| | | | | [ticket/16267] Check whether the index exists in ACP BBcodes - PHP 7.4
| * | [ticket/16267] Check whether the index exists in ACP BBcodes - PHP 7.43D-I2019-12-251-2/+1
| | | | | | | | | | | | PHPBB3-16267
| * | [ticket/16267] Check whether the index exists in ACP BBcodes - PHP 7.43D-I2019-12-241-1/+5
| |/ | | | | | | PHPBB3-16267
* | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-271-0/+1
|\ \
| * \ Merge pull request #5791 from marc1706/ticket/16271Marc Alexander2019-12-271-0/+1
| |\ \ | | | | | | | | | | | | [ticket/16271] Enable support for 3.3.x API documentation
| | * | [ticket/16271] Enable support for 3.3.x API documentationMarc Alexander2019-12-261-0/+1
| |/ / | | | | | | | | | PHPBB3-16271
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-263-1/+93
|\ \ \ | |/ /
| * | [3.2.x] Update version numbers to 3.2.10-devMarc Alexander2019-12-263-5/+5
| | |
| * | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2019-12-269-17/+109
| |\ \
| | * | [prep-release-3.2.9] Add changelog for 3.2.9-RC1Marc Alexander2019-12-251-0/+56
| | | |
| | * | [prep-release-3.2.9] Update composer dependencies to latestMarc Alexander2019-12-251-8/+8
| | | |
| | * | [prep-release-3.2.9] Add migration for 3.2.9-RC1Marc Alexander2019-12-251-0/+36
| | | |
| | * | [prep-release-3.2.9] Update version numbers to 3.2.9Marc Alexander2019-12-252-3/+3
| | | |
| | * | [prep-release-3.2.9] Update version number to 3.2.9-RC1Marc Alexander2019-12-254-6/+6
| |/ /
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-251-0/+20
|\ \ \ | |/ /
| * | Merge pull request #5564 from xchwarze/PHPBB3-16015Marc Alexander2019-12-251-0/+20
| |\ \ | | | | | | | | | | | | [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validation
| | * | [ticket/16015] Adjust since versionMarc Alexander2019-12-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16015
| | * | [ticket/16015] Fix core.ucp_profile_avatar_upload_validation docblockDSR!2019-04-161-4/+4
| | | | | | | | | | | | | | | | PHPBB3-16015
| | * | [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validationDSR!2019-04-151-0/+2
| | | | | | | | | | | | | | | | PHPBB3-16015
| | * | [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validationDSR!2019-04-141-0/+18
| | | | | | | | | | | | | | | | PHPBB3-16015
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-241-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Merge pull request #5786 from marc1706/ticket/16209Marc Alexander2019-12-241-1/+1
| |\ \ | | | | | | | | | | | | [ticket/16209] Match exactly "phpbb" in nginx example configuration file
| | * | [ticket/16209] Match exactly "phpbb" in nginx example configuration fileAlfredo Ramos2019-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It blocks an image in the ACP. PHPBB3-16209
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-241-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #5784 from 3D-I/ticket/15902Marc Alexander2019-12-241-2/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/15902] Out of range error with Sphinx search
| | * | | [ticket/15902] Out of range error with Sphinx search3D-I2019-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing modification. PHPBB3-15902
| | * | | [ticket/15902] Out of range error with Sphinx search3D-I2019-12-231-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reporter he's waiting this fix to be in the core. I created this PR based on trusting his report. I can't test it. PHPBB3-15902
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-241-1/+1
|\ \ \ \ | |/ / /
| * | | Merge pull request #5785 from 3D-I/ticket/16257Marc Alexander2019-12-241-1/+1
| |\ \ \ | | |/ / | |/| | | | | | [ticket/16257] Typo in SMTP_SERVER_EXPLAIN
| | * | [ticket/16257] Typo in SMTP_SERVER_EXPLAIN3D-I2019-12-241-1/+1
| |/ / | | | | | | | | | PHPBB3-16257
* | | Merge pull request #5782 from marc1706/ticket/16263Marc Alexander2019-12-231-0/+5
|\ \ \ | | | | | | | | | | | | [ticket/16263] Ensure that remove_email_hash depends on migration adding hash
| * | | [ticket/16263] Ensure that remove_email_hash depends on migration adding hashMarc Alexander2019-12-231-0/+5
|/ / / | | | | | | | | | PHPBB3-16263
* | | Merge pull request #5779 from 3D-I/ticket/16260Marc Alexander2019-12-231-4/+7
|\ \ \ | | | | | | | | | | | | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.4
| * | | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.43D-I2019-12-221-10/+7
| | | | | | | | | | | | | | | | PHPBB3-16260
| * | | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.43D-I2019-12-221-7/+11
| | | | | | | | | | | | | | | | PHPBB3-16260
| * | | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.43D-I2019-12-211-4/+6
| | | | | | | | | | | | | | | | PHPBB3-16260
* | | | Merge pull request #5781 from marc1706/ticket/16263Marc Alexander2019-12-221-40/+40
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/16263] Do not expect numbers as strings in apache provider test
| * | | | [ticket/16263] Do not expect numbers as strings in apache provider testMarc Alexander2019-12-221-40/+40
| |/ / / | | | | | | | | | | | | PHPBB3-16263
* | | | Merge pull request #5780 from 3D-I/ticket/16261Marc Alexander2019-12-221-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/16261] Missing check whether the index exists in install - PHP 7.4
| * | | [ticket/16261] Missing check whether the index exists in install - PHP 7.43D-I2019-12-221-1/+1
|/ / / | | | | | | | | | PHPBB3-16261
* | | [3.3.x] Update version numbers to 3.3.0-RC2-devMarc Alexander2019-12-213-4/+4
| | |
* | | Merge branch 'prep-release-3.3.0-RC1' into 3.3.xMarc Alexander2019-12-218-7/+74
|\ \ \