aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #5766 from marc1706/ticket/16224-3.3.xMarc Alexander2019-12-132-200/+313
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | [ticket/16224] Update composer dependencies - 3.3.x version
| * | | | | | | Merge branch 'ticket/16224' into ticket/16224-3.3.xMarc Alexander2019-12-121-23/+28
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | [ticket/16224] Update fast-image-size to 1.1.6Marc Alexander2019-12-121-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16224
| * | | | | | | Merge branch 'ticket/16224' into ticket/16224-3.3.xMarc Alexander2019-12-042-193/+301
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | [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 #5751 from AlfredoRamos/ticket/16235Marc Alexander2019-12-121-3/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/16235] Fix PHP CodeSniffer ignore patterns
| * | | | | | | | [ticket/16235] Fix PHP CodeSniffer ignore patternsAlfredo Ramos2019-11-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16235
* | | | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-122-1/+36
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | 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 branch '3.2.x' into 3.3.xMarc Alexander2019-12-125-1/+56
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | 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 #5748 from marc1706/ticket/16226Marc Alexander2019-12-061-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/16226] Prevent Apache servers from using MultiViews
| * | | | | | | | [ticket/16226] Prevent Apache servers from using MultiViewsMarc Alexander2019-11-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16226
* | | | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-063-7/+65
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 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 #5756 from mrgoldy/ticket/16239Marc Alexander2019-12-062-22/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/16239] Remove deprecated phpbb\db\tools
| * | | | | | | | | | [ticket/16239] Update DB tools in UI test casemrgoldy2019-11-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16239
| * | | | | | | | | | [ticket/16239] Remove deprecated phpbb\db\toolsmrgoldy2019-11-301-21/+0
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16239
* | | | | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-065-10/+25
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | 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 branch '3.2.x' into 3.3.xMarc Alexander2019-12-041-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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 branch '3.2.x' into 3.3.xMarc Alexander2019-12-041-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | / / / / / | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | 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 #5752 from rxu/ticket/16236Marc Alexander2019-12-041-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/16236] Bump phpBB 3.3 max PHP version requirement to PHP 7.4
| * | | | | | | | | | [ticket/16236] Bump phpBB 3.3 max PHP version requirement to PHP 7.4rxu2019-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16236
* | | | | | | | | | | Merge pull request #5758 from VSEphpbb/ticket/16241Marc Alexander2019-12-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | [ticket/16241] Color Palette backwards compatibility
| * | | | | | | | | | [ticket/16241] Color Palette backwards compatibilityMatt Friedman2019-11-301-2/+2
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16241
* | | | | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-11-281-7/+18
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | 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 #5749 from 3D-I/ticket/16227Marc Alexander2019-11-281-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/16227] Fix undefined vars on login
| * | | | | | | | | | | [ticket/16227] Fix undefined vars on login3D-I2019-11-251-0/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16227
* | | | | | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-11-282-5/+37
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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 #5750 from mrgoldy/ticket/12539Marc Alexander2019-11-281-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12539] Rebind live member search navigation
| * | | | | | | | | | | [ticket/12539] Rebind live member search navigationmrgoldy2019-11-261-0/+2
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12539