Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.3.x'HEADmaster | 2020-02-01 | 6 | -4/+51 | |
|\ | |||||
| * | Merge branch '3.2.x' into 3.3.x | 2020-02-01 | 6 | -4/+51 | |
| |\ | |||||
| | * | Merge pull request #5832 from KYPREO/ticket/16329origin/3.2.x | 2020-02-01 | 6 | -4/+51 | |
| | |\ | | | | | | | | | | | | | [ticket/16329] Add configuration options for Plupload | ||||
| | | * | [ticket/16329] Add configuration options for Plupload | 2020-01-28 | 3 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330 | ||||
| | | * | Merge branch '3.2.x' into ticket/16329 | 2020-01-22 | 2 | -0/+18 | |
| | | |\ | |||||
| | | * | | [ticket/16329] Add configuration options for Plupload | 2020-01-22 | 4 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330 | ||||
| | | * | | [ticket/16329] Add configuration options for Plupload | 2020-01-20 | 3 | -27/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330 | ||||
| | | * | | [ticket/16329] Add configuration options for Plupload | 2020-01-20 | 5 | -5/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16329 PHPBB3-16330 | ||||
* | | | | | Merge branch '3.3.x' | 2020-01-30 | 3 | -7/+7 | |
|\| | | | | |||||
| * | | | | Merge pull request #5843 from JoshyPHP/ticket/16342 | 2020-01-30 | 3 | -7/+7 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/16342] Increase default hashing costs for Argon2 passwords | ||||
| | * | | | | [ticket/16342] Increase default hashing costs for Argon2 passwords | 2020-01-28 | 3 | -7/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16342 | ||||
* | | | | | | Merge branch '3.3.x' | 2020-01-30 | 1 | -1/+18 | |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | 2020-01-30 | 1 | -1/+18 | |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge pull request #5834 from mrgoldy/ticket/15370 | 2020-01-30 | 1 | -1/+18 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | [ticket/15370] Loading indicator when submitting permissions | ||||
| | | * | | | [ticket/15370] Loading indicator when submitting permissions | 2020-01-21 | 1 | -1/+18 | |
| | | |/ / | | | | | | | | | | | | | | | | PHPBB3-15370 | ||||
* | | | | | Merge branch '3.3.x' | 2020-01-27 | 2 | -123/+108 | |
|\| | | | | |||||
| * | | | | Merge pull request #5825 from AlfredoRamos/ticket/16313 | 2020-01-27 | 2 | -122/+107 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | [ticket/16313] Remove http block from sample Nginx configuration file | ||||
| | * | | | | [ticket/16313] Remove http block from sample Nginx configuration file | 2020-01-09 | 2 | -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' | 2020-01-25 | 2 | -0/+9 | |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | 2020-01-25 | 2 | -0/+9 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge pull request #5837 from 3D-I/ticket/16337 | 2020-01-25 | 2 | -0/+9 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/16337] Fix Emoji in BBcode Helpline | ||||
| | | * | | | | [ticket/16337] Fix Emoji in BBcode Helpline | 2020-01-24 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16337 | ||||
| | | * | | | | [ticket/16337] Fix Emoji in BBcode Helpline | 2020-01-24 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16337 | ||||
| | | * | | | | [ticket/16337] Fix Emoji in BBcode Helpline | 2020-01-24 | 2 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16337 | ||||
* | | | | | | | Merge branch '3.3.x' | 2020-01-24 | 1 | -20/+27 | |
|\| | | | | | | |||||
| * | | | | | | Merge branch '3.2.x' into 3.3.x | 2020-01-24 | 1 | -20/+27 | |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #5836 from 3D-I/ticket/16316 | 2020-01-24 | 1 | -20/+29 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | [ticket/16316] Fix breadcrumbs markup validation | ||||
| | | * | | | | [ticket/16316] Fix breadcrumbs markup validation | 2020-01-24 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16316 | ||||
| | | * | | | | [ticket/16316] Fix breadcrumbs markup validation | 2020-01-21 | 1 | -20/+29 | |
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | PHPBB3-16316 | ||||
* | | | | | | Merge branch '3.3.x' | 2020-01-22 | 1 | -6/+0 | |
|\| | | | | | |||||
| * | | | | | Merge pull request #5822 from rxu/ticket/16307 | 2020-01-22 | 1 | -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 set | 2020-01-08 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16307 | ||||
* | | | | | | | Merge branch '3.3.x' | 2020-01-22 | 4 | -9/+10 | |
|\| | | | | | | |||||
| * | | | | | | Merge branch '3.2.x' into 3.3.x | 2020-01-22 | 4 | -9/+10 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge pull request #5833 from mrgoldy/ticket/16332 | 2020-01-22 | 4 | -9/+10 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | [ticket/16332] Code and Quote language strings globally available | ||||
| | | * | | | | [ticket/16332] Amend formatting tests to expect translated code string | 2020-01-21 | 2 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-16332 | ||||
| | | * | | | | [ticket/16332] Code and Quote language strings globally available | 2020-01-21 | 2 | -3/+4 | |
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | PHPBB3-16332 | ||||
* | | | | | | Merge branch '3.3.x' | 2020-01-20 | 1 | -0/+6 | |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | 2020-01-20 | 1 | -0/+6 | |
| |\| | | | | |||||
| | * | | | | Merge pull request #5814 from 3D-I/ticket/15079 | 2020-01-20 | 1 | -0/+6 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/15079] Fix Emoji and rich text in subject of post draft | ||||
| | | * | | | | [ticket/15079] Fix Emoji and rich text in Draft subject | 2020-01-02 | 1 | -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 subject | 2020-01-02 | 1 | -0/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-15079 | ||||
* | | | | | | | Merge branch '3.3.x' | 2020-01-20 | 1 | -0/+12 | |
|\| | | | | | | |||||
| * | | | | | | Merge branch '3.2.x' into 3.3.x | 2020-01-20 | 1 | -0/+12 | |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #5813 from 3D-I/ticket/15712 | 2020-01-20 | 1 | -0/+12 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | [ticket/15712] Fix Emoji and rich text in PM subject & draft | ||||
| | | * | | | | [ticket/15712] Add Emoji and rich text in PM Draft subject | 2020-01-03 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extends to Drafts PHPBB3-15712 | ||||
| | | * | | | | [ticket/15712] Add Emoji and rich text in PM subject | 2020-01-02 | 1 | -0/+6 | |
| | | |/ / / | | | | | | | | | | | | | | | | | | | PHPBB3-15712 | ||||
* | | | | | | Merge branch '3.3.x' | 2020-01-18 | 3 | -7/+12 | |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | 2020-01-18 | 3 | -7/+12 | |
| |\| | | | | |||||
| | * | | | | Merge pull request #5821 from marc1706/ticket/16296 | 2020-01-18 | 3 | -7/+12 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/16296] Adjust form token check for mark actions |