aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.3.x'Marc Alexander2020-01-201-0/+12
|\
| * Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-201-0/+12
| |\
| | * Merge pull request #5813 from 3D-I/ticket/15712Marc Alexander2020-01-201-0/+12
| | |\
| | | * [ticket/15712] Add Emoji and rich text in PM Draft subject3D-I2020-01-031-0/+6
| | | * [ticket/15712] Add Emoji and rich text in PM subject3D-I2020-01-021-0/+6
* | | | Merge branch '3.3.x'Marc Alexander2020-01-182-7/+7
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-182-7/+7
| |\| |
| | * | [ticket/16296] Adjust form token check for mark actionsMarc Alexander2020-01-072-7/+7
* | | | Merge branch '3.3.x'Marc Alexander2020-01-091-8/+8
|\| | |
| * | | Merge pull request #5812 from rxu/ticket/16288Marc Alexander2020-01-091-8/+8
| |\ \ \
| | * | | [ticket/16288] Drop redundant parenthesesrxu2020-01-081-1/+1
| | * | | [ticket/16288] PHP 8 compatibilityrxu2020-01-031-8/+8
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-043-6/+25
|\| | | |
| * | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-043-6/+25
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | [ticket/security-250] Check form key when approving group membershipMarc Alexander2020-01-031-0/+5
| | * | [ticket/security-252] Check form token on marking PMMarc Alexander2020-01-031-5/+5
| | * | [ticket/security-251] Check form token when moving PM to folderMarc Alexander2020-01-031-0/+7
| | * | Merge pull request #58 from phpbb/ticket/security-253Marc Alexander2020-01-031-0/+7
| | |\ \
| | | * | [ticket/security-253] Check form key when exporting PM dataMarc Alexander2019-12-261-0/+7
| | | |/
| | * / [ticket/security-249] Do not handle avatar submit on invalid tokenMarc Alexander2019-12-261-6/+6
| | |/
* | | Merge branch '3.3.x'Marc Alexander2020-01-011-8/+8
|\| |
| * | [ticket/16277] Move from each() functionrxu2019-12-291-8/+8
* | | Merge branch '3.3.x'Marc Alexander2019-12-061-6/+9
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-061-6/+9
| |\|
| | * Merge pull request #5737 from marc1706/ticket/16211Marc Alexander2019-12-061-6/+9
| | |\
| | | * [ticket/16211] Use form to ensure link data is passed on coppa registrationMarc Alexander2019-11-271-10/+5
| | | * [ticket/16211] Prevent skipping COPPA via URL parameterMarc Alexander2019-11-141-2/+10
* | | | Merge branch '3.3.x'Marc Alexander2019-12-061-1/+4
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-061-1/+4
| |\| |
| | * | [ticket/16247] Quote PM has no identifier3D-I2019-12-051-1/+4
| | |/
* | | Merge branch '3.3.x'Marc Alexander2019-11-212-2/+1
|\| |
| * | [ticket/16167] Remove uses of user_email_hashMarc Alexander2019-11-182-2/+1
* | | Merge branch '3.3.x'Marc Alexander2019-11-141-8/+6
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-11-141-8/+6
| |\|
| | * [ticket/16210] Ensure terms of use is not skipped by enforcing form tokenMarc Alexander2019-11-121-8/+6
* | | Merge branch '3.3.x'Marc Alexander2019-10-072-6/+6
|\| |
| * | [ticket/14465] Remove setting for maximum password lengthMarc Alexander2019-10-032-6/+6
* | | Merge branch '3.3.x'Marc Alexander2019-10-031-174/+0
|\| |
| * | Merge pull request #5652 from marc1706/ticket/11327Marc Alexander2019-10-031-174/+0
| |\ \
| | * | [ticket/11327] Move UCP remind functionality to a controller for password resetMarc Alexander2019-08-081-174/+0
* | | | Merge branch '3.3.x'Marc Alexander2019-09-201-2/+5
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-201-2/+5
| |\ \ \ | | |/ / | |/| / | | |/
| | * [ticket/security/244] Add form token check to pluploadMarc Alexander2019-08-241-2/+5
* | | Merge branch '3.3.x'Marc Alexander2019-07-271-0/+10
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-271-0/+10
| |\|
| | * Merge pull request #5630 from 3D-I/ticket/16103Marc Alexander2019-07-271-0/+10
| | |\
| | | * [ticket/16103] Add core.pm_modify_message_subject3D-I2019-07-201-0/+10
* | | | Merge branch '3.3.x'Marc Alexander2019-07-221-1/+2
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-07-221-1/+2
| |\| |
| | * | Merge pull request #5606 from senky/ticket/15976Marc Alexander2019-07-221-1/+2
| | |\ \ | | | |/ | | |/|