aboutsummaryrefslogtreecommitdiff
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.3.x'Marc Alexander2020-01-094-15/+24
|\
| * Merge pull request #5812 from rxu/ticket/16288Marc Alexander2020-01-094-15/+24
| |\
| | * [ticket/16288] Drop redundant parenthesesrxu2020-01-081-1/+1
| | * [ticket/16288] PHP 8 compatibilityrxu2020-01-034-15/+24
* | | Merge branch '3.3.x'Marc Alexander2020-01-091-1/+1
|\| |
| * | [ticket/16311] Fix password length ACP setting explanationrxu2020-01-091-1/+1
* | | Merge pull request #5731 from marc1706/ticket/16204Marc Alexander2020-01-069-433/+21
|\ \ \
| * | | [ticket/16204] Remove mentions of hooksMarc Alexander2019-12-061-2/+0
| * | | [ticket/16204] Remove hook finder and services fileMarc Alexander2019-11-234-107/+0
| * | | [ticket/16204] Remove hooks systemMarc Alexander2019-11-076-324/+21
* | | | Merge branch '3.3.x'Marc Alexander2020-01-0612-29/+117
|\ \ \ \ | | |/ / | |/| |
| * | | [prep-release-3.3.0] Update changelogMarc Alexander2020-01-061-0/+1
| * | | Merge pull request #5820 from marc1706/ticket/16293Marc Alexander2020-01-061-1/+1
| |\ \ \
| | * | | [ticket/16293] Do not update to hashes that don't support combined hashingMarc Alexander2020-01-061-1/+1
| * | | | [prep-release-3.3.0] Rename 3.3 to ProteusMarc Alexander2020-01-051-3/+3
| * | | | Merge pull request #5818 from marc1706/ticket/16266Marc Alexander2020-01-051-11/+3
| |\ \ \ \
| | * | | | [ticket/16266] Remove extra declaration of constantsMarc Alexander2020-01-051-11/+3
| | |/ / /
| * | | | [prep-release-3.3.0] Update changelogMarc Alexander2020-01-041-0/+1
| * | | | Merge pull request #5817 from marc1706/ticket/16290Marc Alexander2020-01-049-14/+28
| |\ \ \ \
| | * | | | [ticket/16290] Update to new SVG logo in package docsMarc Alexander2020-01-049-14/+28
| | |/ / /
| * | | | [prep-release-3.3.0] Add changelog for 3.3.0Marc Alexander2020-01-041-0/+43
| * | | | [prep-release-3.3.0] Add migration for 3.3.0Marc Alexander2020-01-041-0/+37
| * | | | [prep-release-3.3.0] Update version numbers for 3.3.0 releaseMarc Alexander2020-01-045-6/+6
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-045-6/+87
|\| | | |
| * | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-045-6/+87
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-046-7/+88
| | |\ \ \
| | | * | | [prep-release-3.2.9] Update changelog for 3.2.9Marc Alexander2020-01-041-0/+25
| | | * | | [prep-release-3.2.9] Add migration for 3.2.9Marc Alexander2020-01-041-0/+37
| | | * | | [prep-release-3.2.9] Update version numbers for 3.2.9Marc Alexander2020-01-043-3/+3
| | | * | | [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
| | | * | | | Merge pull request #59 from phpbb/ticket/security-249Marc Alexander2020-01-031-6/+6
| | | |\ \ \ \
| | | | * | | | [ticket/security-249] Do not handle avatar submit on invalid tokenMarc Alexander2019-12-261-6/+6
| | | | |/ / /
| | * | | | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-026-12/+63
| | |\| | | |
| | | * | | | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-0/+1
| | | * | | | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-1/+1
| | | * | | | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-026-12/+62
| | * | | | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-011-1/+1
| | |\| | | |
| | | * | | | Merge pull request #5803 from marc1706/ticket/16282Marc Alexander2020-01-011-1/+1
| | | |\ \ \ \
| | | | * | | | [ticket/16282] Adjust jQuery cdn url in schema_dataMarc Alexander2019-12-311-1/+1
| | | | |/ / /
| | | * | | | Merge branch 'ticket/15592' into prep-release-3.2.9Marc Alexander2020-01-011-2/+2
| | | |\ \ \ \
| | | | * | | | [ticket/15592] Fix attachments place inline button if BBCode is disabledAlfredo Ramos2020-01-011-2/+2
| | | | |/ / /
| | | * | | | Merge pull request #5792 from KYPREO/ticket/16269Marc Alexander2020-01-012-0/+2
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-034-11/+20
|\| | | | | |
| * | | | | | Merge pull request #5811 from paul999/ticket/16287Marc Alexander2020-01-034-11/+20
| |\ \ \ \ \ \
| | * | | | | | [ticket/16287] Correctly pass json response to PHP fileMarc Alexander2020-01-032-2/+2
| | * | | | | | [ticket/16287] Remove loops. prefix in providers loopMarc Alexander2020-01-031-1/+1