summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25203 from nextcloud/version/20.0.6/RC1v20.0.6RC1Roeland Jago Douma2021-01-191-2/+2
|\ | | | | 20.0.6 RC1
| * 20.0.6 RC1Roeland Jago Douma2021-01-191-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #25199 from nextcloud/update-3rdpartyMorris Jobke2021-01-191-0/+0
|\ | | | | [stable20] Update 3rdparty after Archive_Tar
| * Update 3rdparty after Archive_TarJoas Schilling2021-01-191-0/+0
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #25190 from nextcloud/backport/25181/stable20Roeland Jago Douma2021-01-191-18/+18
|\ \ | | | | | | [stable20] Update CRL due to revoked gravatar.crl
| * | Update CRL due to revoked gravatar.crlMorris Jobke2021-01-181-18/+18
| | | | | | | | | | | | | | | | | | https://github.com/nextcloud/app-certificate-requests/pull/362 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #25193 from nextcloud/backport/25186/stable20Roeland Jago Douma2021-01-191-0/+1
|\ \ \ | | | | | | | | [stable20] Don't log keys on checkSignature
| * | | Don't log keys on checkSignatureJoas Schilling2021-01-181-0/+1
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / [tx-robot] updated from transifexNextcloud bot2021-01-1934-48/+96
|/ /
* | Merge pull request #25178 from nextcloud/backport/25176/stable20Morris Jobke2021-01-183-4/+2774
|\ \ | |/ |/| [stable20] Add "composer.lock" for acceptance tests to git
| * Add "composer.lock" for acceptance tests to gitDaniel Calviño Sánchez2021-01-183-4/+2774
|/ | | | | | | | | | As "composer.lock" was not versioned the dependencies had to be resolved everytime that the acceptance tests run, which took some precious time. Besides that the dependency versions were also tightened for better control. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2021-01-1830-8/+182
|
* Merge pull request #25152 from nextcloud/backport/25138/stable20Roeland Jago Douma2021-01-172-4/+5
|\ | | | | [stable20] Fix comparison of PHP versions
| * Update psalm baseline to allow warning of implicit cast to stringMorris Jobke2021-01-151-2/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Fix comparison of PHP versionsDamien Goutte-Gattat2021-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | Use the builtin function `version_compare` to check an app's compatibility with the available PHP version, instead of reusing the `OC\App\CompareVersion::isCompatible` method which is intended to compare Nextcloud versions. PHP version strings do not always necessarily follow the simple Major.Minor.Patch format used by Nextcloud and therefore cannot be properly compared by that method. Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
* | [tx-robot] updated from transifexNextcloud bot2021-01-1740-50/+370
| |
* | [tx-robot] updated from transifexNextcloud bot2021-01-166-6/+34
| |
* | Merge pull request #25146 from nextcloud/backport/25142/stable20Morris Jobke2021-01-151-1/+4
|\ \ | |/ |/| [stable20] Do not redirect to logout after login
| * Do not redirect to logout after loginRoeland Jago Douma2021-01-151-1/+4
|/ | | | | | | This can happen when the session was killed due to a timeout. Then logout was triggered. Nobody wants to login only to be logged out again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #25143 from nextcloud/backport/25141/stable20Morris Jobke2021-01-152-3/+6
|\ | | | | [stable20] Add a hint about the direction of priority
| * Add a hint about the direction of priorityJoas Schilling2021-01-152-3/+6
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #25077 from nextcloud/backport/25034/stable20Morris Jobke2021-01-151-2/+2
|\ | | | | [stable20] Make sure to do priority app upgrades first
| * Make sure to do priority app upgrades firstJulius Härtl2021-01-111-2/+2
| | | | | | | | | | | | | | | | Otherwise those apps might not be loaded when the others app migrations are running. The previous loading of authentication apps in the upgrade step never worked as it just returns in maintenance mode Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2021-01-1510-2/+20
| |
* | Merge pull request #25120 from nextcloud/backport/25036/stable20blizzz2021-01-144-12/+177
|\ \ | | | | | | [stable20] respect DB restrictions on number of arguments in statements and queries
| * | CI satisfactionArthur Schiwon2021-01-141-1/+0
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | silence psalm false positiveArthur Schiwon2021-01-141-0/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | DB: warn on parameter number constraintsArthur Schiwon2021-01-142-6/+112
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | respect DB limits limit per statement and queryArthur Schiwon2021-01-142-6/+64
|/ / | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #25102 from nextcloud/version/20.0.5/finalv20.0.5Roeland Jago Douma2021-01-141-2/+2
|\ \ | | | | | | 20.0.5
| * | 20.0.5Roeland Jago Douma2021-01-121-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2021-01-1410-0/+50
| | |
* | | [tx-robot] updated from transifexNextcloud bot2021-01-1322-24/+130
|/ /
* | Merge pull request #25064 from nextcloud/version/20.0.5/rc2v20.0.5RC2Roeland Jago Douma2021-01-121-2/+2
|\ \ | | | | | | 20.0.5 RC2
| * | 20.0.5 RC2Roeland Jago Douma2021-01-111-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #25076 from nextcloud/backport/25016/stable20Roeland Jago Douma2021-01-127-3/+182
|\ \ \ | | | | | | | | [stable20] Add setup check to verify that the used DB version is still supported…
| * | | Add setup check to verify that the used DB version is still supported in the ↵Morris Jobke2021-01-127-3/+182
| | | | | | | | | | | | | | | | | | | | | | | | next major release Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2021-01-1222-114/+280
| |_|/ |/| |
* | | Merge pull request #25074 from nextcloud/backport/25069/stable20Morris Jobke2021-01-111-7/+0
|\ \ \ | |/ / |/| | [stable20] Don't remove assignable column for now
| * | Don't remove assignable column for nowVincent Petry2021-01-111-7/+0
|/ / | | | | | | | | | | It causes side effects. Signed-off-by: Vincent Petry <vincent@nextcloud.com>
* | Merge pull request #25066 from nextcloud/psalm/noid/update-psalm-baselineRoeland Jago Douma2021-01-111-10/+16
|\ \ | | | | | | [stable20] Update psalm-baseline.xml
| * | [stable20] Update psalm-baseline.xmlMorris Jobke2021-01-111-10/+16
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #25019 from nextcloud/backport/24999/stable20Morris Jobke2021-01-112-2/+3
|\ \ \ | |/ / |/| | [stable20] Set the user language when adding the footer
| * | Set the user language when adding the footerJulius Härtl2021-01-082-2/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #25035 from nextcloud/backport/25017/stable20Morris Jobke2021-01-113-3/+3
|\ \ \ | |_|/ |/| | [stable20] Fix clearing the label of a share
| * | Fix clearing the label of a shareDaniel Calviño Sánchez2021-01-083-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the label is being edited its value is stored in "newLabel", and the original label is shown only if "newLabel" is not set. However, as it was checked against any falsy value instead of only undefined when the label was cleared and thus it has an empty value the original label was shown instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
* | | [tx-robot] updated from transifexNextcloud bot2021-01-1116-0/+76
| | |
* | | [tx-robot] updated from transifexNextcloud bot2021-01-1016-0/+80
| | |
* | | [tx-robot] updated from transifexNextcloud bot2021-01-0922-12/+52
|/ /
* | Merge pull request #25030 from nextcloud/backport/25029/stable20Roeland Jago Douma2021-01-081-3/+3
|\ \ | |/ |/| [stable20] Change defaultapp in config.sample.php to dashboard to improve docs and align it to source code