aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/16003] Fix num_posts syncJakub Senko2019-05-241-0/+1
| | | | PHPBB3-16003
* Merge pull request #5598 from marc1706/ticket/16067Marc Alexander2019-05-231-0/+1
|\ | | | | | | [ticket/16067] Specify trusty build environment
| * [ticket/16067] Specify trusty build environmentMarc Alexander2019-05-231-0/+1
|/ | | | PHPBB3-16067
* Merge pull request #5587 from 3D-I/ticket/16048Marc Alexander2019-05-141-1/+1
|\ | | | | | | [ticket/16048] Fix restore backup from ACP
| * [ticket/16048] Fix restore backup from ACP3D-I2019-05-071-1/+1
| | | | | | | | PHPBB3-16048
* | Merge pull request #5588 from rxu/ticket/16050Marc Alexander2019-05-141-1/+1
|\ \ | | | | | | | | | [ticket/16050] Fix PHP warning in MCP Banning tab on PHP 7.2+
| * | [ticket/16050] Fix PHP warning in MCP Banning tab on PHP 7.2+rxu2019-05-111-1/+1
| |/ | | | | | | PHPBB3-16050
* | Merge pull request #5590 from cclauss/patch-1Marc Alexander2019-05-141-1/+0
|\ \ | |/ |/| | | [ticket/16058] Travis CI: "sudo: required" not longer is
| * [ticket/16058] Travis CI: "sudo: required" not longer iscclauss2019-05-131-1/+0
|/ | | | | | | | | | [Travis are now recommending removing the __sudo__ tag]( https://blog.travis-ci.com/2018-11-19-required-linux-infrastructure-migration). "_If you currently specify __sudo:__ in your __.travis.yml__, we recommend removing that configuration_" PHPBB3-16058
* Merge branch 'prep-release-3.2.7' into 3.2.xMarc Alexander2019-05-053-2/+39
|\
| * [prep-release-3.2.7] Add 3.2.7 migrationMarc Alexander2019-05-041-0/+37
| |
| * [prep-release-3.2.7] Update version numbers to 3.2.7Marc Alexander2019-05-044-5/+5
| |
* | [3.2.x] Update version numbers to 3.2.8-devMarc Alexander2019-05-033-5/+5
| |
* | Merge branch 'prep-release-3.2.7' into 3.2.xMarc Alexander2019-05-039-8/+71
|\ \ | |/
| * [prep-release-3.2.7] Add changelog for 3.2.7-RC1Marc Alexander2019-05-021-0/+14
| |
| * [prep-release-3.2.7] Add migration for 3.2.7-RC1Marc Alexander2019-05-021-0/+36
| |
| * Merge pull request #5581 from marc1706/ticket/16042Marc Alexander2019-05-021-1/+14
| |\ | | | | | | | | | [ticket/16042] Use S_LOGIN_REDIRECT to output login form token
| | * [ticket/16042] Adjust positioning and add comment to overwriteMarc Alexander2019-05-021-1/+2
| | | | | | | | | | | | PHPBB3-16042
| | * [ticket/16042] Use S_LOGIN_REDIRECT to output login form tokenMarc Alexander2019-05-021-1/+13
| |/ | | | | | | PHPBB3-16042
| * [prep-release-3.2.7] Update version numbers to 3.2.7Marc Alexander2019-05-022-3/+3
| |
| * [prep-release-3.2.7] Update version numbers for 3.2.7-RC1Marc Alexander2019-05-024-4/+4
|/
* Merge pull request #5577 from JoshyPHP/ticket/16034Marc Alexander2019-05-022-2/+8
|\ | | | | | | [ticket/16034] Fix [url=] links being incorrectly shortened
| * [ticket/16034] Fix [url=] links being incorrectly shortenedJoshyPHP2019-04-282-2/+8
| | | | | | | | PHPBB3-16034
* | Merge pull request #5578 from rubencm/ticket/16036Marc Alexander2019-05-024-0/+8
|\ \ | | | | | | | | | [ticket/16036] Add S_FORM_TOKEN_LOGIN to all login forms
| * | [ticket/16036] Add S_FORM_TOKEN_LOGIN to all login formsrubencm2019-04-294-0/+8
| | | | | | | | | | | | PHPBB3-16036
* | | Merge pull request #5579 from VSEphpbb/ticket/16037Marc Alexander2019-05-011-2/+2
|\ \ \ | | | | | | | | | | | | [ticket/16037] Fix UCP PM ViewFolder PHP Notice error
| * | | [ticket/16037] Fix UCP PM ViewFolder PHP Notice errorMatt Friedman2019-04-301-2/+2
| |/ / | | | | | | | | | PHPBB3-16037
* | | Merge pull request #5580 from mrgoldy/ticket/16039Marc Alexander2019-05-011-1/+1
|\ \ \ | |/ / |/| | | | | [ticket/16039] Global dispatcher
| * | [ticket/16039] Global dispatchermrgoldy2019-05-011-1/+1
|/ / | | | | | | PHPBB3-16039
* | Merge branch 'prep-release-3.2.6' into 3.2.xMarc Alexander2019-04-2923-29/+236
|\ \ | |/ |/|
| * [prep-release-3.2.6] Update Changelog and add missing preg_matchMarc Alexander2019-04-282-2/+3
| |
| * [prep-release-3.2.6] Update changelog for 3.2.6Marc Alexander2019-04-281-0/+18
| |
| * [prep-release-3.2.6] Add migration to 3.2.6Marc Alexander2019-04-271-0/+39
| |
| * [prep-release-3.2.6] Update to 3.2.6 versionMarc Alexander2019-04-274-5/+5
| |
| * [prep-release-3.2.6] Fix expected data in avatar manager testMarc Alexander2019-04-271-1/+1
| |
| * Merge pull request #48 from phpbb/ticket/security/228Marc Alexander2019-04-274-2/+22
| |\ | | | | | | | | | [ticket/security/228] Add form token to login box
| | * [ticket/security/228] Add form token to login boxDerky2019-04-264-2/+22
| | | | | | | | | | | | SECURITY-228
| * | Merge pull request #47 from phpbb/ticket/security/233Marc Alexander2019-04-273-2/+46
| |\ \ | | | | | | | | | | | | [ticket/security/233] Make smtp_password and smtp_username dynamic
| | * | [ticket/security/233] Fix invalid INSERT INTOMarc Alexander2019-04-211-2/+2
| | | | | | | | | | | | | | | | SECURITY-233
| | * | [ticket/security/233] Make smtp_password and smtp_username dynamicMarc Alexander2019-04-213-2/+46
| | | | | | | | | | | | | | | | SECURITY-233
| * | | Merge pull request #46 from phpbb/ticket/security/231Marc Alexander2019-04-274-4/+39
| |\ \ \ | | | | | | | | | | | | | | | [ticket/security/231] Disable remote avatar functionality & add warning
| | * | | [ticket/security/231] Disable remote avatar functionality & add warningMarc Alexander2019-04-174-4/+39
| | | |/ | | |/| | | | | | | | | SECURITY-231
| * | | Merge pull request #45 from phpbb/ticket/security/234Marc Alexander2019-04-274-4/+26
| |\ \ \ | | | | | | | | | | | | | | | [ticket/security/234] Add URL validation for input fields & main site URL
| | * | | [ticket/security/234] Add test for URL validationMarc Alexander2019-04-141-1/+9
| | | | | | | | | | | | | | | | | | | | SECURITY-234
| | * | | [ticket/security/234] Add URL validation for input fieldsMarc Alexander2019-04-143-3/+17
| | |/ / | | | | | | | | | | | | SECURITY-234
| * | | Merge pull request #44 from phpbb/ticket/security/235Marc Alexander2019-04-272-13/+33
| |\ \ \ | | | | | | | | | | | | | | | Ticket/security/235 Wildcard char count in search
| | * | | [ticket/security/235] Update search native testsMarc Alexander2019-04-261-4/+4
| | | | | | | | | | | | | | | | | | | | SECURITY-235
| | * | | [ticket/security/235] Only allow one wildcard in the search query to limit ↵Derky2019-04-261-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the database load SECURITY-235
| | * | | [ticket/security/235] Use whitespace instead of word boundary regex to ↵Derky2019-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove wildcards This fixes removing the wildcard in the following search query: *.test SECURITY-235
| | * | | [ticket/security/235] Remove non trailing wildcards from search keywordsDerky2019-04-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Database indexes are only used if wildcards are used at the end. SECURITY-235