aboutsummaryrefslogtreecommitdiff
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5832 from KYPREO/ticket/16329origin/3.2.xMarc Alexander2020-02-015-2/+43
|\
| * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-283-6/+6
| * Merge branch '3.2.x' into ticket/16329KYPREO2020-01-222-0/+18
| |\
| * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-224-7/+7
| * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-202-25/+13
| * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-205-5/+58
* | | Merge pull request #5834 from mrgoldy/ticket/15370Marc Alexander2020-01-301-1/+18
|\ \ \
| * | | [ticket/15370] Loading indicator when submitting permissionsmrgoldy2020-01-211-1/+18
| |/ /
* | | Merge pull request #5837 from 3D-I/ticket/16337Marc 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 pull request #5836 from 3D-I/ticket/16316Marc Alexander2020-01-241-20/+29
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/16316] Fix breadcrumbs markup validation3D-I2020-01-241-3/+3
| * | | [ticket/16316] Fix breadcrumbs markup validation3D-I2020-01-211-20/+29
| | |/ | |/|
* | | Merge pull request #5833 from mrgoldy/ticket/16332Marc Alexander2020-01-222-3/+4
|\ \ \ | |/ / |/| |
| * | [ticket/16332] Code and Quote language strings globally availablemrgoldy2020-01-212-3/+4
| |/
* | Merge pull request #5814 from 3D-I/ticket/15079Marc Alexander2020-01-201-0/+6
|\ \
| * | [ticket/15079] Fix Emoji and rich text in Draft subject3D-I2020-01-021-18/+1
| * | [ticket/15079] Fix Emoji and rich text in Draft subject3D-I2020-01-021-0/+23
* | | 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 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
* | | [ticket/16328] Inform admins about PHP requirements in phpBB 3.3Marc Alexander2020-01-181-2/+2
* | | Merge pull request #5819 from mrgoldy/ticket/16291Marc Alexander2020-01-131-1/+1
|\ \ \ | |/ / |/| |
| * | [ticket/16291] Add missing report timemrgoldy2020-01-051-1/+1
| |/
* | 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 pull request #5799 from AlfredoRamos/ticket/15592Marc Alexander2020-01-011-2/+2
|\ \ \