aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-218-9/+18
|\
| * Merge pull request #5692 from stevendegroote/ticket/16159Marc Alexander2019-09-218-9/+18
| |\
| | * [ticket/16159] Use predefined DATE_RFC3339stevendegroote2019-09-184-8/+8
| | * Merge branch '3.2.x' into ticket/16159stevendegroote2019-09-17387-3534/+8608
| | |\
| | * | [ticket/16159] Wrap post times in html time tagstevendegroote2019-09-178-9/+18
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-2017-18/+144
|\ \ \ \ | |/ / /
| * | | Merge branch 'prep-release-3.2.8' into 3.2.xMarc Alexander2019-09-2018-19/+145
| |\ \ \ | | |_|/ | |/| |
| | * | [prep-release-3.2.8] Add migration for 3.2.8Marc Alexander2019-09-081-0/+36
| | * | [prep-release-3.2.8] Update version numbers for 3.2.8 releaseMarc Alexander2019-09-083-3/+3
| | * | [prep-release-3.2.8] Update changelog for 3.2.8Marc Alexander2019-09-081-1/+27
| | * | [prep-release-3.2.8] Update CREDITS.txtMarc Alexander2019-09-081-3/+3
| | * | Merge pull request #5679 from mrgoldy/ticket/16123Marc Alexander2019-09-081-2/+3
| | |\ \
| | | * | [ticket/16123] Remove redundant if checkmrgoldy2019-09-071-5/+3
| | | * | [ticket/16123] Check with empty()mrgoldy2019-09-071-1/+1
| | | * | [ticket/16123] Show proper banned email messagemrgoldy2019-09-071-1/+4
| | * | | Merge pull request #54 from phpbb/ticket/security/243Marc Alexander2019-09-021-1/+1
| | |\ \ \
| | | * | | [ticket/security/243] Remove invalid markup from bbcode.htmlMarc Alexander2019-09-021-1/+1
| | * | | | [ticket/security/243] Fail silently on unsupported values for font sizeMarc Alexander2019-08-312-13/+1
| | |/ / /
| | * | | Merge pull request #5070 from rxu/ticket/15467Marc Alexander2019-08-312-0/+6
| | |\ \ \
| | | * | | [ticket/15467] Fix JS for permissions settingNekstati2019-07-281-9/+3
| | | * | | [ticket/15467] Fix JS for permissions settingrxu2019-07-282-0/+12
| | * | | | Merge pull request #52 from phpbb/ticket/security/247Marc Alexander2019-08-251-0/+3
| | |\ \ \ \
| | | * | | | [ticket/security/247] Disable loading of local files on client sideMarc Alexander2019-08-111-0/+3
| | * | | | | Merge pull request #51 from phpbb/ticket/security/243Marc Alexander2019-08-254-2/+14
| | |\ \ \ \ \
| | | * | | | | [ticket/security/243] Use bbcode.html like formattingMarc Alexander2019-07-181-1/+1
| | | * | | | | [ticket/security/243] Limit size BBCode to 4 numeric charactersMarc Alexander2019-07-173-3/+3
| | | * | | | | [ticket/security/243] Limit size values to supported valuesMarc Alexander2019-07-162-0/+12
| | * | | | | | Merge pull request #50 from phpbb/ticket/security/246Marc Alexander2019-08-251-6/+6
| | |\ \ \ \ \ \
| | | * | | | | | [ticket/security/246] Check form key no matter if submit is setMarc Alexander2019-07-141-6/+6
| | | |/ / / / /
| | * | | | | | [ticket/security/244] Add parse_attachment form token check to posting.phpMarc Alexander2019-08-241-1/+4
| | * | | | | | [ticket/security/244] Add form token check to pluploadMarc Alexander2019-08-244-2/+52
| | | |_|_|/ / | | |/| | | |
| | * | | | | Merge pull request #5661 from Crizz0/ticket/16136Marc Alexander2019-08-241-1/+1
| | |\ \ \ \ \
| | | * | | | | [ticket/16136] Implement extended explainationChristian Schnegelberger2019-08-221-1/+1
| | | * | | | | [ticket/16136] Reword sentence for account already linkedChristian Schnegelberger2019-08-191-1/+1
| | * | | | | | [ticket/16134] Exclude group leaders on group member purgekinerity2019-08-221-0/+1
| | |/ / / / /
* | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-09-012-13/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/16084] Remove redundant backup radio buttonmrgoldy2019-08-262-13/+3
* | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-172-0/+112
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [3.2.x] Update version numbers to 3.2.9-devMarc Alexander2019-08-172-2/+2
| |/ / / / /
| * | | | | [prep-release-3.2.8] Update changelog for 3.2.8-RC1Marc Alexander2019-08-171-0/+75
| * | | | | [prep-release-3.2.8] Add migration for 3.2.8-RC1Marc Alexander2019-08-171-0/+37
| * | | | | [prep-release-3.2.8] Update version numbers to 3.2.8Marc Alexander2019-08-172-3/+3
| * | | | | [prep-release-3.2.8] Update version numbers to 3.2.8-RC1Marc Alexander2019-08-173-3/+3
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-172-0/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5658 from rubencm/ticket/13175Marc Alexander2019-08-172-0/+16
| |\ \ \ \ \
| | * | | | | [ticket/13175] Check if account is already linked when using OAuthrubencm2019-08-142-0/+16
* | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-08-173-48/+67
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #5656 from 3D-I/ticket/16019Marc Alexander2019-08-173-48/+67
| |\ \ \ \ \ \
| | * | | | | | [ticket/16019] Amend explanation3D-I2019-08-141-1/+1
| | * | | | | | [ticket/16019] Short explanation3D-I2019-08-141-1/+1