aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.3.x'HEADmasterMarc Alexander2020-02-016-4/+51
|\
| * Merge branch '3.2.x' into 3.3.xMarc Alexander2020-02-016-4/+51
| |\
| | * Merge pull request #5832 from KYPREO/ticket/16329origin/3.2.xMarc Alexander2020-02-016-4/+51
| | |\ | | | | | | | | | | | | [ticket/16329] Add configuration options for Plupload
| | | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-283-6/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330
| | | * Merge branch '3.2.x' into ticket/16329KYPREO2020-01-222-0/+18
| | | |\
| | | * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-224-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330
| | | * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-203-27/+21
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330
| | | * | [ticket/16329] Add configuration options for PluploadKYPREO2020-01-205-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-303-7/+7
|\| | | |
| * | | | Merge pull request #5843 from JoshyPHP/ticket/16342Marc Alexander2020-01-303-7/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16342] Increase default hashing costs for Argon2 passwords
| | * | | | [ticket/16342] Increase default hashing costs for Argon2 passwordsJoshyPHP2020-01-283-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16342
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-301-1/+18
|\| | | | |
| * | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-301-1/+18
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Merge pull request #5834 from mrgoldy/ticket/15370Marc Alexander2020-01-301-1/+18
| | |\ \ \ | | | | | | | | | | | | | | | | | | [ticket/15370] Loading indicator when submitting permissions
| | | * | | [ticket/15370] Loading indicator when submitting permissionsmrgoldy2020-01-211-1/+18
| | | |/ / | | | | | | | | | | | | | | | PHPBB3-15370
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-272-123/+108
|\| | | |
| * | | | Merge pull request #5825 from AlfredoRamos/ticket/16313Marc Alexander2020-01-272-122/+107
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/16313] Remove http block from sample Nginx configuration file
| | * | | | [ticket/16313] Remove http block from sample Nginx configuration fileAlfredo Ramos2020-01-092-122/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change placeholder domain to example.com Also prefer fastcgi.conf over fastcgi_params as per Nginx documentation. PHPBB3-16313
* | | | | | 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
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #5837 from 3D-I/ticket/16337Marc Alexander2020-01-252-0/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16337] Fix Emoji in BBcode Helpline
| | | * | | | [ticket/16337] Fix Emoji in BBcode Helpline3D-I2020-01-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16337
| | | * | | | [ticket/16337] Fix Emoji in BBcode Helpline3D-I2020-01-241-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16337
| | | * | | | [ticket/16337] Fix Emoji in BBcode Helpline3D-I2020-01-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16337
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-241-20/+27
|\| | | | | |
| * | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-241-20/+27
| |\| | | | |
| | * | | | | Merge pull request #5836 from 3D-I/ticket/16316Marc Alexander2020-01-241-20/+29
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | [ticket/16316] Fix breadcrumbs markup validation
| | | * | | | [ticket/16316] Fix breadcrumbs markup validation3D-I2020-01-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16316
| | | * | | | [ticket/16316] Fix breadcrumbs markup validation3D-I2020-01-211-20/+29
| | | | |_|/ | | | |/| | | | | | | | | | | | | | PHPBB3-16316
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-221-6/+0
|\| | | | |
| * | | | | Merge pull request #5822 from rxu/ticket/16307Marc Alexander2020-01-221-6/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set
| | * | | | | [ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is setrxu2020-01-081-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16307
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-224-9/+10
|\| | | | | |
| * | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-224-9/+10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #5833 from mrgoldy/ticket/16332Marc Alexander2020-01-224-9/+10
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | [ticket/16332] Code and Quote language strings globally available
| | | * | | | [ticket/16332] Amend formatting tests to expect translated code stringmrgoldy2020-01-212-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16332
| | | * | | | [ticket/16332] Code and Quote language strings globally availablemrgoldy2020-01-212-3/+4
| | | | |_|/ | | | |/| | | | | | | | | | | | | | PHPBB3-16332
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-201-0/+6
|\| | | | |
| * | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-201-0/+6
| |\| | | |
| | * | | | Merge pull request #5814 from 3D-I/ticket/15079Marc Alexander2020-01-201-0/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/15079] Fix Emoji and rich text in subject of post draft
| | | * | | | [ticket/15079] Fix Emoji and rich text in Draft subject3D-I2020-01-021-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User can save Emoji in drafts since the topic title is checked on post submission already. Moreover this way the draft can not be lost somehow. PHPBB3-15079
| | | * | | | [ticket/15079] Fix Emoji and rich text in Draft subject3D-I2020-01-021-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15079
* | | | | | | 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] Fix Emoji and rich text in PM subject & draft
| | | * | | | [ticket/15712] Add Emoji and rich text in PM Draft subject3D-I2020-01-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends to Drafts PHPBB3-15712
| | | * | | | [ticket/15712] Add Emoji and rich text in PM subject3D-I2020-01-021-0/+6
| | | |/ / / | | | | | | | | | | | | | | | | | | PHPBB3-15712
* | | | | | 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 actions