Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #5793 from marc1706/ticket/16271 | Marc Alexander | 2019-12-27 | 14 | -252/+442 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [ticket/16271] Add Sami 4.x and update necessary dependencies | |||||
| * | | | | | | [ticket/16271] Fix invalid docblocks | Marc Alexander | 2019-12-27 | 11 | -8/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16271 | |||||
| * | | | | | | [ticket/16271] Add Sami 4.x and update necessary dependencies | Marc Alexander | 2019-12-27 | 3 | -244/+424 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16271 | |||||
* | | | | | | | Merge pull request #5788 from 3D-I/ticket/16221 | Marc Alexander | 2019-12-27 | 2 | -56/+72 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/16221] Fix ACP statistics layout | |||||
| * | | | | | | | [ticket/16221] Fix ACP statistics layout | 3D-I | 2019-12-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix wide-screen layout PHPBB3-16221 | |||||
| * | | | | | | | [ticket/16221] Fix ACP statistics layout | 3D-I | 2019-12-25 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts PHPBB3-16221 | |||||
| * | | | | | | | [ticket/16221] Fix ACP statistics layout | 3D-I | 2019-12-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16221 | |||||
| * | | | | | | | [ticket/16221] Fix ACP statistics layout | 3D-I | 2019-12-24 | 2 | -54/+64 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16221 | |||||
* | | | | | | | | Merge pull request #5787 from 3D-I/ticket/16267 | Marc Alexander | 2019-12-27 | 1 | -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.4 | 3D-I | 2019-12-25 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16267 | |||||
| * | | | | | | | [ticket/16267] Check whether the index exists in ACP BBcodes - PHP 7.4 | 3D-I | 2019-12-24 | 1 | -1/+5 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16267 | |||||
* | | | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-27 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | / / / | | |_|/ / / | |/| | | | | ||||||
| * | | | | | Merge pull request #5791 from marc1706/ticket/16271 | Marc Alexander | 2019-12-27 | 1 | -0/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/16271] Enable support for 3.3.x API documentation | |||||
| | * | | | | | [ticket/16271] Enable support for 3.3.x API documentation | Marc Alexander | 2019-12-26 | 1 | -0/+1 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | PHPBB3-16271 | |||||
* | | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-26 | 3 | -1/+93 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | [3.2.x] Update version numbers to 3.2.10-dev | Marc Alexander | 2019-12-26 | 3 | -5/+5 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'prep-release-3.2.9' into 3.2.x | Marc Alexander | 2019-12-26 | 9 | -17/+109 | |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | * | | | | [prep-release-3.2.9] Add changelog for 3.2.9-RC1 | Marc Alexander | 2019-12-25 | 1 | -0/+56 | |
| | | | | | | ||||||
| | * | | | | [prep-release-3.2.9] Update composer dependencies to latest | Marc Alexander | 2019-12-25 | 1 | -8/+8 | |
| | | | | | | ||||||
| | * | | | | [prep-release-3.2.9] Add migration for 3.2.9-RC1 | Marc Alexander | 2019-12-25 | 1 | -0/+36 | |
| | | | | | | ||||||
| | * | | | | [prep-release-3.2.9] Update version numbers to 3.2.9 | Marc Alexander | 2019-12-25 | 2 | -3/+3 | |
| | | | | | | ||||||
| | * | | | | [prep-release-3.2.9] Update version number to 3.2.9-RC1 | Marc Alexander | 2019-12-25 | 4 | -6/+6 | |
| |/ / / / | ||||||
* | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-25 | 1 | -0/+20 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge pull request #5564 from xchwarze/PHPBB3-16015 | Marc Alexander | 2019-12-25 | 1 | -0/+20 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validation | |||||
| | * | | | | [ticket/16015] Adjust since version | Marc Alexander | 2019-12-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16015 | |||||
| | * | | | | [ticket/16015] Fix core.ucp_profile_avatar_upload_validation docblock | DSR! | 2019-04-16 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16015 | |||||
| | * | | | | [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validation | DSR! | 2019-04-15 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16015 | |||||
| | * | | | | [ticket/16015] Add new hook core.ucp_profile_avatar_upload_validation | DSR! | 2019-04-14 | 1 | -0/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16015 | |||||
* | | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | ||||||
| * | | | | Merge pull request #5786 from marc1706/ticket/16209 | Marc Alexander | 2019-12-24 | 1 | -1/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/16209] Match exactly "phpbb" in nginx example configuration file | |||||
| | * | | | | [ticket/16209] Match exactly "phpbb" in nginx example configuration file | Alfredo Ramos | 2019-12-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It blocks an image in the ACP. PHPBB3-16209 | |||||
* | | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-24 | 1 | -2/+2 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge pull request #5784 from 3D-I/ticket/15902 | Marc Alexander | 2019-12-24 | 1 | -2/+2 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15902] Out of range error with Sphinx search | |||||
| | * | | | | | [ticket/15902] Out of range error with Sphinx search | 3D-I | 2019-12-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing modification. PHPBB3-15902 | |||||
| | * | | | | | [ticket/15902] Out of range error with Sphinx search | 3D-I | 2019-12-23 | 1 | -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.x | Marc Alexander | 2019-12-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge pull request #5785 from 3D-I/ticket/16257 | Marc Alexander | 2019-12-24 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | [ticket/16257] Typo in SMTP_SERVER_EXPLAIN | |||||
| | * | | | | [ticket/16257] Typo in SMTP_SERVER_EXPLAIN | 3D-I | 2019-12-24 | 1 | -1/+1 | |
| |/ / / / | | | | | | | | | | | | | | | | PHPBB3-16257 | |||||
* | | | | | Merge pull request #5782 from marc1706/ticket/16263 | Marc Alexander | 2019-12-23 | 1 | -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 hash | Marc Alexander | 2019-12-23 | 1 | -0/+5 | |
|/ / / / / | | | | | | | | | | | | | | | | PHPBB3-16263 | |||||
* | | | | | Merge pull request #5779 from 3D-I/ticket/16260 | Marc Alexander | 2019-12-23 | 1 | -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.4 | 3D-I | 2019-12-22 | 1 | -10/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16260 | |||||
| * | | | | | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.4 | 3D-I | 2019-12-22 | 1 | -7/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16260 | |||||
| * | | | | | [ticket/16260] Missing check whether the index exists in ACP - PHP 7.4 | 3D-I | 2019-12-21 | 1 | -4/+6 | |
| | |_|/ / | |/| | | | | | | | | | | | | | PHPBB3-16260 | |||||
* | | | | | Merge pull request #5781 from marc1706/ticket/16263 | Marc Alexander | 2019-12-22 | 1 | -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 test | Marc Alexander | 2019-12-22 | 1 | -40/+40 | |
| |/ / / / | | | | | | | | | | | | | | | | PHPBB3-16263 | |||||
* | | | | | Merge pull request #5780 from 3D-I/ticket/16261 | Marc Alexander | 2019-12-22 | 1 | -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.4 | 3D-I | 2019-12-22 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | PHPBB3-16261 | |||||
* | | | | [3.3.x] Update version numbers to 3.3.0-RC2-dev | Marc Alexander | 2019-12-21 | 3 | -4/+4 | |
| | | | | ||||||
* | | | | Merge branch 'prep-release-3.3.0-RC1' into 3.3.x | Marc Alexander | 2019-12-21 | 8 | -7/+74 | |
|\ \ \ \ |