aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge pull request #5790 from rxu/ticket/16266Marc Alexander2019-12-292-15/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16266] Fix argon2 driver issue for Sodium implementation
| * | | | | | [ticket/16266] Prevent "Use of undefined constant" warning in testsrxu2019-12-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16266
| * | | | | | [ticket/16266] Fix testsrxu2019-12-281-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16266
| * | | | | | [ticket/16266] Refactor patch using argon2 predefined constantsrxu2019-12-282-23/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16266
| * | | | | | [ticket/16266] More code optimizingrxu2019-12-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16266
| * | | | | | [ticket/16266] More code optimizingrxu2019-12-282-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16266
| * | | | | | [ticket/16266] Optimize coderxu2019-12-282-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16266
| * | | | | | [ticket/16266] Fix argon2 driver issue for Sodium implementationrxu2019-12-262-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16266
* | | | | | | Merge pull request #5796 from rxu/ticket/16276Marc Alexander2019-12-2917-20/+43
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | [ticket/16276] Fix bbcode_firstpass undefined mode property
| * | | | | | [ticket/16276] Further fix PHP nightly testsrxu2019-12-2915-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16276
| * | | | | | [ticket/16276] Fix bbcode_firstpass undefined mode propertyrxu2019-12-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16276
* | | | | | | Merge pull request #5794 from 3D-I/ticket/16273Marc Alexander2019-12-281-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | [ticket/16273] Check whether the index exists in memberlist - PHP 7.4
| * | | | | | [ticket/16273] Check whether the index exists in memberlist - PHP 7.43D-I2019-12-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cast to bool PHPBB3-16273
| * | | | | | [ticket/16273] Check whether the index exists in memberlist - PHP 7.43D-I2019-12-271-3/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-16273
* | | | | | 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
|\ \ \ \ \ \ | |/ / / / /