Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.3.x'HEADmaster | Marc Alexander | 2020-02-01 | 5 | -2/+43 |
|\ | |||||
| * | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-02-01 | 5 | -2/+43 |
| |\ | |||||
| | * | Merge pull request #5832 from KYPREO/ticket/16329origin/3.2.x | Marc Alexander | 2020-02-01 | 5 | -2/+43 |
| | |\ | |||||
| | | * | [ticket/16329] Add configuration options for Plupload | KYPREO | 2020-01-28 | 3 | -6/+6 |
| | | * | Merge branch '3.2.x' into ticket/16329 | KYPREO | 2020-01-22 | 2 | -0/+18 |
| | | |\ | |||||
| | | * | | [ticket/16329] Add configuration options for Plupload | KYPREO | 2020-01-22 | 4 | -7/+7 |
| | | * | | [ticket/16329] Add configuration options for Plupload | KYPREO | 2020-01-20 | 2 | -25/+13 |
| | | * | | [ticket/16329] Add configuration options for Plupload | KYPREO | 2020-01-20 | 5 | -5/+58 |
* | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-30 | 2 | -5/+5 |
|\| | | | | |||||
| * | | | | Merge pull request #5843 from JoshyPHP/ticket/16342 | Marc Alexander | 2020-01-30 | 2 | -5/+5 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/16342] Increase default hashing costs for Argon2 passwords | JoshyPHP | 2020-01-28 | 2 | -5/+5 |
* | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-30 | 1 | -1/+18 |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-30 | 1 | -1/+18 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge pull request #5834 from mrgoldy/ticket/15370 | Marc Alexander | 2020-01-30 | 1 | -1/+18 |
| | |\ \ \ | |||||
| | | * | | | [ticket/15370] Loading indicator when submitting permissions | mrgoldy | 2020-01-21 | 1 | -1/+18 |
| | | |/ / | |||||
* | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-27 | 1 | -116/+92 |
|\| | | | | |||||
| * | | | | Merge pull request #5825 from AlfredoRamos/ticket/16313 | Marc Alexander | 2020-01-27 | 1 | -115/+91 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/16313] Remove http block from sample Nginx configuration file | Alfredo Ramos | 2020-01-09 | 1 | -115/+91 |
* | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-25 | 2 | -0/+9 |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-25 | 2 | -0/+9 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge pull request #5837 from 3D-I/ticket/16337 | Marc Alexander | 2020-01-25 | 2 | -0/+9 |
| | |\ \ \ \ | |||||
| | | * | | | | [ticket/16337] Fix Emoji in BBcode Helpline | 3D-I | 2020-01-24 | 1 | -1/+4 |
| | | * | | | | [ticket/16337] Fix Emoji in BBcode Helpline | 3D-I | 2020-01-24 | 1 | -1/+7 |
| | | * | | | | [ticket/16337] Fix Emoji in BBcode Helpline | 3D-I | 2020-01-24 | 2 | -2/+2 |
* | | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-24 | 1 | -20/+27 |
|\| | | | | | | |||||
| * | | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-24 | 1 | -20/+27 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #5836 from 3D-I/ticket/16316 | Marc Alexander | 2020-01-24 | 1 | -20/+29 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | [ticket/16316] Fix breadcrumbs markup validation | 3D-I | 2020-01-24 | 1 | -3/+3 |
| | | * | | | | [ticket/16316] Fix breadcrumbs markup validation | 3D-I | 2020-01-21 | 1 | -20/+29 |
| | | | |_|/ | | | |/| | | |||||
* | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-22 | 1 | -6/+0 |
|\| | | | | | |||||
| * | | | | | Merge pull request #5822 from rxu/ticket/16307 | Marc Alexander | 2020-01-22 | 1 | -6/+0 |
| |\ \ \ \ \ | |||||
| | * | | | | | [ticket/16307] Fix SQL time reporting when debug.sql_explain parameter is set | rxu | 2020-01-08 | 1 | -6/+0 |
* | | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-22 | 2 | -3/+4 |
|\| | | | | | | |||||
| * | | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-22 | 2 | -3/+4 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge pull request #5833 from mrgoldy/ticket/16332 | Marc Alexander | 2020-01-22 | 2 | -3/+4 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | [ticket/16332] Code and Quote language strings globally available | mrgoldy | 2020-01-21 | 2 | -3/+4 |
| | | | |_|/ | | | |/| | | |||||
* | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-20 | 1 | -0/+6 |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-20 | 1 | -0/+6 |
| |\| | | | | |||||
| | * | | | | Merge pull request #5814 from 3D-I/ticket/15079 | Marc Alexander | 2020-01-20 | 1 | -0/+6 |
| | |\ \ \ \ | |||||
| | | * | | | | [ticket/15079] Fix Emoji and rich text in Draft subject | 3D-I | 2020-01-02 | 1 | -18/+1 |
| | | * | | | | [ticket/15079] Fix Emoji and rich text in Draft subject | 3D-I | 2020-01-02 | 1 | -0/+23 |
* | | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-20 | 1 | -0/+12 |
|\| | | | | | | |||||
| * | | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-20 | 1 | -0/+12 |
| |\| | | | | | |||||
| | * | | | | | Merge pull request #5813 from 3D-I/ticket/15712 | Marc Alexander | 2020-01-20 | 1 | -0/+12 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | [ticket/15712] Add Emoji and rich text in PM Draft subject | 3D-I | 2020-01-03 | 1 | -0/+6 |
| | | * | | | | [ticket/15712] Add Emoji and rich text in PM subject | 3D-I | 2020-01-02 | 1 | -0/+6 |
| | | |/ / / | |||||
* | | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-18 | 3 | -7/+12 |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-18 | 3 | -7/+12 |
| |\| | | | | |||||
| | * | | | | Merge pull request #5821 from marc1706/ticket/16296 | Marc Alexander | 2020-01-18 | 3 | -7/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | [ticket/16296] Adjust form token check for mark actions | Marc Alexander | 2020-01-07 | 3 | -7/+12 |