aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-049-20/+178
|\
| * [prep-release-3.2.9] Update changelog for 3.2.9Marc Alexander2020-01-041-0/+25
| |
| * [prep-release-3.2.9] Add migration for 3.2.9Marc Alexander2020-01-041-0/+37
| |
| * [prep-release-3.2.9] Update version numbers for 3.2.9Marc Alexander2020-01-044-5/+5
| |
| * Merge pull request #56 from phpbb/ticket/security-250Marc Alexander2020-01-033-12/+94
| |\ | | | | | | | | | [ticket/security-250] Check form key when approving group membership
| | * [ticket/security-250] Check form key when approving group membershipMarc Alexander2020-01-033-12/+94
| |/ | | | | | | SECURITY-250
| * Merge pull request #57 from phpbb/ticket/security-251Marc Alexander2020-01-031-0/+7
| |\ | | | | | | | | | [ticket/security-251] Check form token when moving PM to folder
| | * [ticket/security-252] Check form token on marking PMMarc Alexander2020-01-031-5/+5
| | | | | | | | | | | | SECURITY-252
| | * [ticket/security-251] Check form token when moving PM to folderMarc Alexander2020-01-031-0/+7
| |/ | | | | | | SECURITY-251
| * Merge pull request #58 from phpbb/ticket/security-253Marc Alexander2020-01-031-0/+7
| |\ | | | | | | | | | [ticket/security-253] Check form key when exporting PM data
| | * [ticket/security-253] Check form key when exporting PM dataMarc Alexander2019-12-261-0/+7
| | | | | | | | | | | | SECURITY-253
| * | Merge pull request #59 from phpbb/ticket/security-249Marc Alexander2020-01-031-6/+6
| |\ \ | | | | | | | | | | | | [ticket/security-249] Do not handle avatar submit on invalid token
| | * | [ticket/security-249] Do not handle avatar submit on invalid tokenMarc Alexander2019-12-261-6/+6
| | |/ | | | | | | | | | SECURITY-249
* | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-026-12/+63
|\ \ \ | |/ /
| * | Merge branch 'ticket/16279' into prep-release-3.2.9Marc Alexander2020-01-026-12/+63
| |\ \
| | * | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-0/+1
| | | | | | | | | | | | | | | | PHPBB3-16279
| | * | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16279
| | * | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-026-12/+62
| |/ / | | | | | | | | | PHPBB3-16279
* | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-011-1/+1
|\ \ \ | |/ /
| * | Merge pull request #5803 from marc1706/ticket/16282Marc Alexander2020-01-011-1/+1
| |\ \ | | | | | | | | | | | | [ticket/16282] Adjust jQuery cdn url in schema_data
| | * | [ticket/16282] Adjust jQuery cdn url in schema_dataMarc Alexander2019-12-311-1/+1
| | |/ | | | | | | | | | PHPBB3-16282
* | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-010-0/+0
|\ \ \ | |/ /
| * | Merge branch 'ticket/15592' into prep-release-3.2.9Marc Alexander2020-01-011-2/+2
| |\ \
| | * | [ticket/15592] Fix attachments place inline button if BBCode is disabledAlfredo Ramos2020-01-011-2/+2
| | |/ | | | | | | | | | PHPBB3-15592
| * | Merge pull request #5792 from KYPREO/ticket/16269Marc Alexander2020-01-012-0/+2
| |\ \ | | |/ | |/| | | | [ticket/16269] Strip HTML markup from Sphinx search index
* | | Merge pull request #5799 from AlfredoRamos/ticket/15592Marc Alexander2020-01-011-2/+2
|\ \ \ | | | | | | | | | | | | [ticket/15592] Fix attachments place inline button if BBCode is disabled
| * | | [ticket/15592] Fix attachments place inline button if BBCode is disabledAlfredo Ramos2019-12-291-2/+2
| | | | | | | | | | | | | | | | PHPBB3-15592
* | | | Merge pull request #5792 from KYPREO/ticket/16269Marc Alexander2019-12-302-0/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| [ticket/16269] Strip HTML markup from Sphinx search index
| * | [ticket/16269] Strip HTML markup from Sphinx search indexKYPREO2019-12-272-0/+2
| | | | | | | | | | | | PHPBB3-16269
* | | 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
* | | [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 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 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 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 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