aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.3.x'HEADmasterMarc Alexander2020-02-012-2/+35
|\
| * Merge branch '3.2.x' into 3.3.xMarc Alexander2020-02-012-2/+35
| |\
| | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-281-3/+3
| | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-221-1/+1
| | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-202-25/+13
| | * [ticket/16329] Add configuration options for PluploadKYPREO2020-01-202-5/+50
* | | Merge branch '3.3.x'Marc Alexander2020-01-301-3/+3
|\| |
| * | [ticket/16342] Increase default hashing costs for Argon2 passwordsJoshyPHP2020-01-281-3/+3
* | | 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 setrxu2020-01-081-6/+0
* | | | Merge branch '3.3.x'Marc Alexander2020-01-181-0/+2
|\| | |
| * | | [ticket/16323] Replace the spaceless tag with its homologue filterAlfredo Ramos2020-01-141-0/+2
* | | | Merge pull request #5808 from marc1706/ticket/16284Marc Alexander2020-01-1424-345/+581
|\ \ \ \
| * | | | [ticket/16284] Add depends_on to classesMarc Alexander2020-01-146-0/+42
| * | | | [ticket/16284] Adjust create schema and add tables to testsMarc Alexander2020-01-013-24/+60
| * | | | [ticket/16284] Add effectively installed checks where applicableMarc Alexander2020-01-018-119/+181
| * | | | [ticket/16284] Add effectively_installed to add_storage_permissionMarc Alexander2020-01-011-6/+20
| * | | | [ticket/16284] Use tables array in acp_storage_moduleMarc Alexander2020-01-011-1/+1
| * | | | [ticket/16284] Provide tables as array in migrationsMarc Alexander2020-01-012-9/+33
| * | | | [ticket/16284] Add effectively_installed check to acp_storage_moduleMarc Alexander2020-01-011-8/+30
| * | | | [ticket/16284] Add migration for 4.0.0-devMarc Alexander2020-01-011-0/+36
| * | | | [ticket/16284] Move migrations not included in 3.3 to v400Marc Alexander2020-01-0110-0/+0
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-111-5/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [ticket/16308] Fix UCP reset password3D-I2020-01-101-2/+1
| * | | | [ticket/16308] Fix UCP reset password3D-I2020-01-091-5/+2
* | | | | Merge branch '3.3.x'Marc Alexander2020-01-092-3/+6
|\| | | |
| * | | | Merge pull request #5812 from rxu/ticket/16288Marc Alexander2020-01-092-3/+6
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/16288] PHP 8 compatibilityrxu2020-01-032-3/+6
* | | | | Merge pull request #5731 from marc1706/ticket/16204Marc Alexander2020-01-064-123/+0
|\ \ \ \ \
| * | | | | [ticket/16204] Remove hook finder and services fileMarc Alexander2019-11-231-91/+0
| * | | | | [ticket/16204] Remove hooks systemMarc Alexander2019-11-073-32/+0
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-063-12/+41
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #5820 from marc1706/ticket/16293Marc Alexander2020-01-061-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/16293] Do not update to hashes that don't support combined hashingMarc Alexander2020-01-061-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #5818 from marc1706/ticket/16266Marc Alexander2020-01-051-11/+3
| |\ \ \ \ \
| | * | | | | [ticket/16266] Remove extra declaration of constantsMarc Alexander2020-01-051-11/+3
| | |/ / / /
| * | | | | [prep-release-3.3.0] Add migration for 3.3.0Marc Alexander2020-01-041-0/+37
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-041-0/+37
|\| | | | |
| * | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-041-0/+37
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | [prep-release-3.2.9] Add migration for 3.2.9Marc Alexander2020-01-041-0/+37
| | * | | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-021-0/+1
| | * | | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-022-0/+44
| | * | | Merge pull request #5792 from KYPREO/ticket/16269Marc Alexander2020-01-011-0/+1
| | |\ \ \
* | | | | | Merge branch '3.3.x'Marc Alexander2020-01-023-2/+18
|\| | | | |
| * | | | | Merge pull request #5809 from marc1706/ticket/16285Marc Alexander2020-01-023-2/+18
| |\ \ \ \ \
| | * | | | | [ticket/16285] Add sanity checks to migrations for 3.3Marc Alexander2020-01-013-2/+18
* | | | | | | Merge branch '3.3.x'Marc Alexander2020-01-021-3/+1
|\| | | | | |
| * | | | | | Merge pull request #5805 from 3D-I/ticket/16283Marc Alexander2020-01-021-3/+1
| |\ \ \ \ \ \
| | * | | | | | [ticket/16283] Update requirements for 3.3.03D-I2020-01-011-3/+1