aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/prep-release-3.3.0'HEADmasterMaat2020-05-09597-6799/+9668
|\
| * [prep-release-3.3.0] Update changelogMarc Alexander2020-01-061-0/+1
| * 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
| * | [prep-release-3.3.0] Rename 3.3 to ProteusMarc Alexander2020-01-051-3/+3
| * | 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] Update changelogMarc Alexander2020-01-041-0/+1
| * | Merge pull request #5817 from marc1706/ticket/16290Marc Alexander2020-01-049-14/+28
| |\ \
| | * | [ticket/16290] Update to new SVG logo in package docsMarc Alexander2020-01-049-14/+28
| | |/
| * | [prep-release-3.3.0] Add changelog for 3.3.0Marc Alexander2020-01-041-0/+43
| * | [prep-release-3.3.0] Add migration for 3.3.0Marc Alexander2020-01-041-0/+37
| * | [prep-release-3.3.0] Update version numbers for 3.3.0 releaseMarc Alexander2020-01-046-7/+7
| * | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-048-20/+178
| |\ \ | | |/ | |/|
| | * Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-049-20/+178
| | |\
| * | \ Merge pull request #5811 from paul999/ticket/16287Marc Alexander2020-01-034-11/+20
| |\ \ \
| | * | | [ticket/16287] Correctly pass json response to PHP fileMarc Alexander2020-01-032-2/+2
| | * | | [ticket/16287] Remove loops. prefix in providers loopMarc Alexander2020-01-031-1/+1
| | * | | [ticket/16287] Use twig syntax and fix coding guidelines issuesMarc Alexander2020-01-022-7/+7
| | * | | [ticket/16287] After installation an error is given over statistics submissionpaul sohier2020-01-024-10/+19
| * | | | Merge pull request #5810 from marc1706/ticket/16230Marc Alexander2020-01-032-4/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | [ticket/16230] Update links to userguide and support forumsMarc Alexander2020-01-031-2/+2
| | * | | [ticket/16230] Improve wording of FILESYSTEM_CANNOT_ lang stringsMarc Alexander2020-01-021-2/+2
| * | | | 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 pull request #5805 from 3D-I/ticket/16283Marc Alexander2020-01-026-13/+11
| |\ \ \ \
| | * | | | [ticket/16283] Update requirements for 3.3.03D-I2020-01-013-5/+3
| | * | | | [ticket/16283] Update requirements for 3.3.03D-I2019-12-311-1/+1
| | * | | | [ticket/16283] Update requirements for 3.3.03D-I2019-12-316-10/+10
| | |/ / /
| * | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-020-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-026-12/+63
| | |\ \ \
| * | \ \ \ Merge pull request #5802 from 3D-I/ticket/16279Marc Alexander2020-01-026-12/+63
| |\ \ \ \ \
| | * | | | | [ticket/16279] Add permission for Emoji in topic title3D-I2020-01-011-0/+1
| | * | | | | [ticket/16279] Add permission for Emoji in topic title3D-I2019-12-301-1/+1
| | * | | | | [ticket/16279] Add permission for Emoji in topic title3D-I2019-12-306-12/+62
| * | | | | | Merge pull request #5807 from 3D-I/ticket/16273Marc Alexander2020-01-011-3/+4
| |\ \ \ \ \ \
| | * | | | | | [ticket/16273] Check whether the index exists in memberlist - PHP 7.43D-I2020-01-011-3/+4
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #5806 from 3D-I/ticket/16281Marc Alexander2020-01-012-12/+34
| |\ \ \ \ \ \
| | * | | | | | [ticket/16281] Fix Ajax refresh-data for extensions' Tab3D-I2020-01-012-18/+16
| | * | | | | | [ticket/16281] Fix Ajax refresh-data for extensions' Tab3D-I2019-12-311-1/+1
| | * | | | | | [ticket/16281] Fix Ajax refresh-data for extensions' Tab3D-I2019-12-311-2/+2
| | * | | | | | [ticket/16281] Fix Ajax refresh-data for extensions' Tab3D-I2019-12-311-10/+34
| | |/ / / / /
| * | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-010-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-011-1/+1
| | |\ \ \ \ \
| * | \ \ \ \ \ Merge pull request #5804 from marc1706/ticket/16282-3.3Marc Alexander2020-01-011-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/16282] Adjust jQuery cdn url in schema_dataMarc Alexander2019-12-311-1/+1
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-010-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge branch 'prep-release-3.2.9' into 3.2.xMarc Alexander2020-01-010-0/+0
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch '3.2.x' into 3.3.xMarc Alexander2020-01-011-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge pull request #5799 from AlfredoRamos/ticket/15592Marc Alexander2020-01-011-2/+2
| | |\ \ \ \ \ \ \
generated by cgit v1.2.1 (git 2.21.0) at 2024-04-23 07:15:46 +0000