aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/15592] Fix attachments place inline button if BBCode is disabledAlfredo Ramos2019-12-291-2/+2
| | | | PHPBB3-15592
* 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
* | Merge pull request #5777 from KYPREO/ticket/16258Marc Alexander2019-12-211-2/+2
|\ \ | | | | | | | | | [ticket/16258] Fix sample Sphinx configuration file
| * | [ticket/16258] Fix sample Sphinx configuration fileKYPREO2019-12-171-2/+2
|/ / | | | | | | PHPBB3-16258
* | Merge pull request #5765 from marc1706/ticket/16224Marc Alexander2019-12-132-91/+211
|\ \ | | | | | | | | | [ticket/16224] Update composer dependencies - 3.2.x version
| * | [ticket/16224] Update fast-image-size to 1.1.6Marc Alexander2019-12-121-5/+5
| | | | | | | | | | | | PHPBB3-16224
| * | [ticket/16224] Update composer dependenciesMarc Alexander2019-12-041-91/+211
| | | | | | | | | | | | PHPBB3-16224
| * | [ticket/16224] Update composer to 1.9.1Marc Alexander2019-12-041-0/+0
| | | | | | | | | | | | PHPBB3-16224
* | | Merge pull request #5771 from JoshyPHP/ticket/16251Marc Alexander2019-12-122-1/+36
|\ \ \ | | | | | | | | | | | | [ticket/16251] Prevent shortened links from overriding other plugins
| * | | [ticket/16251] Prevent shortened links from overriding other pluginsJoshyPHP2019-12-092-1/+36
| | | | | | | | | | | | | | | | PHPBB3-16251
* | | | Merge pull request #5772 from JoshyPHP/ticket/16252Marc Alexander2019-12-125-1/+56
|\ \ \ \ | |/ / / |/| | | | | | | [ticket/16252] Ignore non-BBCodes when looking for unauthorized markup
| * | | [ticket/16252] Ignore non-BBCodes when looking for unauthorized markupJoshyPHP2019-12-095-1/+56
|/ / / | | | | | | | | | PHPBB3-16252
* | | Merge pull request #5737 from marc1706/ticket/16211Marc Alexander2019-12-063-7/+65
|\ \ \ | | | | | | | | | | | | [ticket/16211] Prevent skipping COPPA via URL parameter
| * | | [ticket/16211] Fix coppa registration testMarc Alexander2019-11-281-3/+2
| | | | | | | | | | | | | | | | PHPBB3-16211
| * | | [ticket/16211] Use form to ensure link data is passed on coppa registrationMarc Alexander2019-11-272-11/+7
| | | | | | | | | | | | | | | | PHPBB3-16211
| * | | [ticket/16211] Prevent skipping COPPA via URL parameterMarc Alexander2019-11-142-2/+65
| | | | | | | | | | | | | | | | PHPBB3-16211
* | | | Merge pull request #5768 from 3D-I/ticket/16247Marc Alexander2019-12-065-10/+25
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/16247] Quote PM has no identifier
| * | | | [ticket/16247] Quote PM has no identifier3D-I2019-12-052-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code review PHPBB3-16247
| * | | | [ticket/16247] Code consistency3D-I2019-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-16247
| * | | | [ticket/16247] Add test not tested3D-I2019-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-16247
| * | | | [ticket/16247] Quote PM has no identifier3D-I2019-12-054-1/+16
|/ / / / | | | | | | | | | | | | PHPBB3-16247
* | | | Merge pull request #5761 from AlfredoRamos/ticket/16242Marc Alexander2019-12-041-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/16242] Fix nginx redirection loop
| * | | | [ticket/16242] Fix nginx redirection loopAlfredo Ramos2019-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-16242
* | | | | Merge pull request #5764 from VSEphpbb/ticket/16246Marc Alexander2019-12-041-3/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | [ticket/16246] Update automated testing section of Readme
| * | | | [ticket/16246] Update automated testing section of ReadmeMatt Friedman2019-12-031-3/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-16246
* | | | | Merge pull request #5730 from 3D-I/ticket/16203Marc Alexander2019-11-281-7/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16203] Enable Emojis and rich text in sent Emails
| * | | | | [ticket/16203] Enable Emojis and rich text in sent Emails3D-I2019-11-061-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16203
* | | | | | Merge pull request #5747 from JoshyPHP/ticket/16228Marc Alexander2019-11-282-5/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16228] Fix BBCodes merging
| * | | | | | [ticket/16228] Fix BBCodes mergingJoshyPHP2019-11-252-5/+37
|/ / / / / / | | | | | | | | | | | | | | | | | | PHPBB3-16228
* | | | | | Merge pull request #5741 from marc1706/ticket/16217Marc Alexander2019-11-221-3/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16217] Enable opcache on travis tests again