aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.3.x'HEADmasterMarc Alexander2020-02-011-0/+4
|\
| * Merge branch '3.2.x' into 3.3.xMarc Alexander2020-02-011-0/+4
| |\
| | * Merge pull request #5832 from KYPREO/ticket/16329origin/3.2.xMarc Alexander2020-02-011-0/+4
| | |\ | | | | | | | | | | | | [ticket/16329] Add configuration options for Plupload
| | | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-281-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330
| | | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-221-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330
| | | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-201-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330
* | | | Merge branch '3.3.x'Marc Alexander2020-01-222-3/+4
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-222-3/+4
| |\| |
| | * | [ticket/16332] Code and Quote language strings globally availablemrgoldy2020-01-212-3/+4
| | |/ | | | | | | | | | PHPBB3-16332
| | * [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-1/+1
| | | | | | | | | | | | PHPBB3-16279
| | * [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-0/+1
| | | | | | | | | | | | PHPBB3-16279
* | | Merge branch '3.3.x'Marc Alexander2020-01-091-1/+1
|\| |
| * | [ticket/16311] Fix password length ACP setting explanationrxu2020-01-091-1/+1
| | | | | | | | | | | | PHPBB3-16311
* | | Merge branch '3.3.x'Marc Alexander2020-01-032-4/+4
|\| |
| * | [ticket/16230] Update links to userguide and support forumsMarc Alexander2020-01-031-2/+2
| | | | | | | | | | | | PHPBB3-16230
| * | [ticket/16230] Improve wording of FILESYSTEM_CANNOT_ lang stringsMarc Alexander2020-01-021-2/+2
| | | | | | | | | | | | PHPBB3-16230
* | | Merge branch '3.3.x'Marc Alexander2020-01-021-1/+1
|\| |
| * | Merge pull request #5805 from 3D-I/ticket/16283Marc Alexander2020-01-021-1/+1
| |\ \ | | | | | | | | | | | | [ticket/16283] Update requirements for 3.3.0
| | * | [ticket/16283] Update requirements for 3.3.03D-I2019-12-311-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16283
* | | | Merge branch '3.3.x'Marc Alexander2020-01-021-0/+1
|\| | |
| * | | Merge pull request #5802 from 3D-I/ticket/16279Marc Alexander2020-01-021-0/+1
| |\ \ \ | | |/ / | |/| | | | | | [ticket/16279] Add permission for Emoji in topic title
| | * | [ticket/16279] Add permission for Emoji in topic title3D-I2019-12-301-1/+1
| | | | | | | | | | | | | | | | PHPBB3-16279
| | * | [ticket/16279] Add permission for Emoji in topic title3D-I2019-12-301-0/+1
| | |/ | | | | | | | | | PHPBB3-16279
* | | Merge branch '3.3.x'Marc Alexander2019-12-241-1/+1
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-12-241-1/+1
| |\|
| | * [ticket/16257] Typo in SMTP_SERVER_EXPLAIN3D-I2019-12-241-1/+1
| | | | | | | | | | | | PHPBB3-16257
* | | Merge branch '3.3.x'Marc Alexander2019-12-211-1/+2
|\| |
| * | [ticket/16250] Add a service to check BBCodes safenessJoshyPHP2019-12-131-1/+2
| | | | | | | | | | | | PHPBB3-16250
* | | Merge branch '3.3.x'Marc Alexander2019-11-222-0/+3
|\| |
| * | Merge pull request #5686 from v12mike/ticket/9837Marc Alexander2019-11-222-0/+3
| |\ \ | | | | | | | | | | | | [ticket/9837] Display unapproved posts to their authors
| | * | [ticket/9837] Apply suggested changes by CHItAMarc Alexander2019-11-221-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9837
| | * | [ticket/9837] Make unapproved posts visible to authorv12mike2019-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | review comments PHPBB3-9837
| | * | [ticket/9837] Display unapproved posts to their authorsv12mike2019-11-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Improve ACP language strings PHPBB3-9837
| | * | [ticket/9837] Make unapproved posts visible to posterv12mike2019-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Improve acp explanation string PHPBB3-9837
| | * | [ticket/9837] Make unapproved posts visible to postersv12mike2019-11-212-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tests Tidy up code Improve user message formatting PHPBB3-9837
| | * | [ticket/9837] Display unapproved posts to postersv12mike2019-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add tests and improve style template PHPBB3-9837
| | * | [ticket/9837] Make unapproved posts visible to postersv12mike2019-11-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Improvements for feature following review PHPBB3-9837
* | | | Merge branch '3.3.x'Marc Alexander2019-11-211-3/+0
|\| | |
| * | | [ticket/16167] Remove uses of user_email_hashMarc Alexander2019-11-181-3/+0
| | | | | | | | | | | | | | | | PHPBB3-16167
* | | | Merge branch '3.3.x'Marc Alexander2019-11-161-0/+1
|\| | |
| * | | Merge pull request #5584 from mrgoldy/ticket/16008Marc Alexander2019-11-161-0/+1
| |\ \ \ | | | | | | | | | | | | | | | [ticket/16008] Clean up OAuth system
| | * | | [ticket/16008] Clean up phpBB OAuth systemmrgoldy2019-11-031-0/+1
| | |/ / | | | | | | | | | | | | PHPBB3-16008
* | | | Merge branch '3.3.x'Marc Alexander2019-11-081-0/+2
|\| | |
| * | | [ticket/12559] Add forum setting to limit subforum legendPayBas2019-11-011-0/+2
| |/ / | | | | | | | | | | | | | | | Squashed all commits, they were basically just typos and errors PHPBB3-12559
* | | Merge branch '3.3.x'Marc Alexander2019-10-261-1/+0
|\| |
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-261-1/+0
| |\|
| | * Merge pull request #5695 from 3D-I/ticket/16161Marc Alexander2019-10-261-1/+0
| | |\ | | | | | | | | | | | | [ticket/16161] Enable BBcodes without closing tag
| | | * [ticket/16161] Enable BBcodes without closing tag3D-I2019-09-221-1/+0
| | | | | | | | | | | | | | | | PHPBB3-16161
* | | | Merge branch '3.3.x'Marc Alexander2019-10-211-2/+2
|\| | |
| * | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-211-2/+2
| |\| |