Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.3.x'HEADmaster | Marc Alexander | 2020-02-01 | 1 | -2/+8 |
|\ | |||||
| * | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-02-01 | 1 | -2/+8 |
| |\ | |||||
| | * | Merge pull request #5832 from KYPREO/ticket/16329origin/3.2.x | Marc Alexander | 2020-02-01 | 1 | -2/+8 |
| | |\ | |||||
| | | * | [ticket/16329] Add configuration options for Plupload | KYPREO | 2020-01-20 | 1 | -2/+8 |
* | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-30 | 1 | -2/+2 |
|\| | | | |||||
| * | | | [ticket/16342] Increase default hashing costs for Argon2 passwords | JoshyPHP | 2020-01-28 | 1 | -2/+2 |
* | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-22 | 2 | -6/+6 |
|\| | | | |||||
| * | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-22 | 2 | -6/+6 |
| |\| | | |||||
| | * | | [ticket/16332] Amend formatting tests to expect translated code string | mrgoldy | 2020-01-21 | 2 | -6/+6 |
| | |/ | |||||
* | | | Merge pull request #5808 from marc1706/ticket/16284 | Marc Alexander | 2020-01-14 | 11 | -6/+33 |
|\ \ \ | |||||
| * | | | [ticket/16284] Adjust create schema and add tables to tests | Marc Alexander | 2020-01-01 | 11 | -6/+33 |
* | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-09 | 3 | -0/+25 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #5823 from JoshyPHP/ticket/16309 | Marc Alexander | 2020-01-09 | 3 | -0/+25 |
| |\ \ \ | |||||
| | * | | | [ticket/16309] Fix smilies with a left square bracket | JoshyPHP | 2020-01-08 | 3 | -0/+25 |
* | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-09 | 17 | -31/+86 |
|\| | | | | |||||
| * | | | | Merge pull request #5812 from rxu/ticket/16288 | Marc Alexander | 2020-01-09 | 17 | -31/+86 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | [ticket/16288] PHP 8 compatibility | rxu | 2020-01-03 | 17 | -31/+86 |
* | | | | | Merge branch '3.3.x' | Marc Alexander | 2020-01-04 | 2 | -12/+89 |
|\| | | | | |_|/ / |/| | | | |||||
| * | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2020-01-04 | 2 | -12/+89 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | [ticket/security-250] Check form key when approving group membership | Marc Alexander | 2020-01-03 | 2 | -12/+89 |
* | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-29 | 1 | -11/+43 |
|\| | | |||||
| * | | Merge pull request #5790 from rxu/ticket/16266 | Marc Alexander | 2019-12-29 | 1 | -11/+43 |
| |\ \ | |||||
| | * | | [ticket/16266] Fix tests | rxu | 2019-12-28 | 1 | -11/+43 |
* | | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-29 | 15 | -17/+41 |
|\| | | | |||||
| * | | | [ticket/16276] Further fix PHP nightly tests | rxu | 2019-12-29 | 14 | -17/+40 |
| * | | | [ticket/16276] Fix bbcode_firstpass undefined mode property | rxu | 2019-12-29 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-22 | 1 | -40/+40 |
|\| | | |||||
| * | | [ticket/16263] Do not expect numbers as strings in apache provider test | Marc Alexander | 2019-12-22 | 1 | -40/+40 |
* | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-21 | 2 | -0/+119 |
|\| | | |||||
| * | | Merge pull request #5770 from JoshyPHP/ticket/16250 | Marc Alexander | 2019-12-21 | 2 | -0/+119 |
| |\ \ | |||||
| | * | | [ticket/16250] Add a service to check BBCodes safeness | JoshyPHP | 2019-12-13 | 2 | -0/+119 |
* | | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-15 | 3 | -8/+147 |
|\| | | | |||||
| * | | | Merge pull request #5728 from rxu/ticket/15294 | Marc Alexander | 2019-12-15 | 3 | -8/+147 |
| |\ \ \ | |||||
| | * | | | [ticket/15294] Minor code adjusting | rxu | 2019-11-05 | 2 | -33/+33 |
| | * | | | [ticket/15294] Add session_gc() tests | rxu | 2019-11-05 | 3 | -1/+140 |
* | | | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-12 | 1 | -0/+35 |
|\| | | | | |||||
| * | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-12 | 1 | -0/+35 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge pull request #5771 from JoshyPHP/ticket/16251 | Marc Alexander | 2019-12-12 | 1 | -0/+35 |
| | |\ \ \ | |||||
| | | * | | | [ticket/16251] Prevent shortened links from overriding other plugins | JoshyPHP | 2019-12-09 | 1 | -0/+35 |
* | | | | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-12 | 4 | -0/+37 |
|\| | | | | | |||||
| * | | | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-12 | 4 | -0/+37 |
| |\| | | | | | |_|_|/ | |/| | | | |||||
| | * | | | [ticket/16252] Ignore non-BBCodes when looking for unauthorized markup | JoshyPHP | 2019-12-09 | 4 | -0/+37 |
| | |/ / | |||||
* | | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-06 | 1 | -0/+54 |
|\| | | | |||||
| * | | | Merge branch '3.2.x' into 3.3.x | Marc Alexander | 2019-12-06 | 1 | -0/+54 |
| |\| | | |||||
| | * | | Merge pull request #5737 from marc1706/ticket/16211 | Marc Alexander | 2019-12-06 | 1 | -0/+54 |
| | |\ \ | |||||
| | | * | | [ticket/16211] Fix coppa registration test | Marc Alexander | 2019-11-28 | 1 | -3/+2 |
| | | * | | [ticket/16211] Prevent skipping COPPA via URL parameter | Marc Alexander | 2019-11-14 | 1 | -0/+55 |
* | | | | | Merge branch '3.3.x' | Marc Alexander | 2019-12-06 | 1 | -1/+2 |
|\| | | | | |||||
| * | | | | Merge pull request #5756 from mrgoldy/ticket/16239 | Marc Alexander | 2019-12-06 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | [ticket/16239] Update DB tools in UI test case | mrgoldy | 2019-11-30 | 1 | -1/+2 |