aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.3.x'HEADmasterMarc Alexander2020-02-011-0/+2
|\
| * Merge branch '3.2.x' into 3.3.xMarc Alexander2020-02-011-0/+2
| |\
| | * Merge pull request #5832 from KYPREO/ticket/16329origin/3.2.xMarc Alexander2020-02-011-0/+2
| | |\
| | | * Merge branch '3.2.x' into ticket/16329KYPREO2020-01-221-0/+12
| | | |\
| | | * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-221-1/+1
| | | * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-201-0/+2
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-252-0/+9
|\| | | |
| * | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-252-0/+9
| |\| | |
| | * | | [ticket/16337] Fix Emoji in BBcode Helpline3D-I2020-01-241-1/+4
| | * | | [ticket/16337] Fix Emoji in BBcode Helpline3D-I2020-01-241-1/+7
| | * | | [ticket/16337] Fix Emoji in BBcode Helpline3D-I2020-01-242-2/+2
| | | |/ | | |/|
* | | | 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-183-7/+12
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-183-7/+12
| |\| |
| | * | Merge pull request #5821 from marc1706/ticket/16296Marc Alexander2020-01-183-7/+12
| | |\ \
| | | * | [ticket/16296] Adjust form token check for mark actionsMarc Alexander2020-01-073-7/+12
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-181-2/+2
|\| | | |
| * | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-181-2/+2
| |\| | |
| | * | | [ticket/16328] Inform admins about PHP requirements in phpBB 3.3Marc Alexander2020-01-181-2/+2
| | |/ /
* | | | Merge branch '3.3.x'Marc Alexander2020-01-092-12/+18
|\| | |
| * | | Merge pull request #5812 from rxu/ticket/16288Marc Alexander2020-01-092-12/+18
| |\ \ \
| | * | | [ticket/16288] Drop redundant parenthesesrxu2020-01-081-1/+1
| | * | | [ticket/16288] PHP 8 compatibilityrxu2020-01-032-12/+18
| * | | | [prep-release-3.3.0] Update version numbers for 3.3.0 releaseMarc Alexander2020-01-041-1/+1
* | | | | Merge pull request #5731 from marc1706/ticket/16204Marc Alexander2020-01-062-290/+21
|\ \ \ \ \
| * | | | | [ticket/16204] Remove mentions of hooksMarc Alexander2019-12-061-2/+0
| * | | | | [ticket/16204] Remove hooks systemMarc Alexander2019-11-072-288/+21
* | | | | | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-043-6/+25
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | [prep-release-3.2.9] Update version numbers for 3.2.9Marc Alexander2020-01-041-1/+1
| | | * | | [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
| | | |/ / /
| | * / / / [3.2.x] Update version numbers to 3.2.10-devMarc Alexander2019-12-261-1/+1
| | |/ / /
| | * | | [prep-release-3.2.9] Update version number to 3.2.9-RC1Marc Alexander2019-12-251-1/+1
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-032-6/+9
|\| | | |
| * | | | [ticket/16287] Correctly pass json response to PHP fileMarc Alexander2020-01-031-1/+1
| * | | | [ticket/16287] Use twig syntax and fix coding guidelines issuesMarc Alexander2020-01-021-1/+1
| * | | | [ticket/16287] After installation an error is given over statistics submissionpaul sohier2020-01-022-6/+9
| | |_|/ | |/| |
* | | | Merge branch '3.3.x'Marc Alexander2020-01-021-3/+3
|\| | |
| * | | Merge pull request #5805 from 3D-I/ticket/16283Marc Alexander2020-01-021-3/+3
| |\ \ \
| | * | | [ticket/16283] Update requirements for 3.3.03D-I2020-01-011-1/+1