f7d13f1613
Merge pull request #25276 from nextcloud/backport/25128/stable20
...
[stable20] extend ILDAPProvider to allow reading arbitrairy ldap attributes for users
2021-01-22 16:15:21 +01:00
b249abc624
Do not obtain userFolder of a federated user
...
Federated shares are somewhat special. So we can't move the files from
the main user and we should try to get it from the intialized root
already.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-22 13:40:25 +00:00
1a1beafeeb
Merge pull request #25261 from nextcloud/backport/25255/stable20
...
[stable20] also use storage copy when dav copying directories
2021-01-22 14:37:01 +01:00
b6d175a609
adjust since
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Co-authored-by: Morris Jobke <hey@morrisjobke.de>
2021-01-22 13:33:33 +00:00
b38149edaa
extend ILDAPProvider to allow reading arbitrairy ldap attributes for users
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-22 13:33:32 +00:00
24a7772d6c
Merge pull request #25263 from nextcloud/backport/25253/stable20
...
[stable20] silence log message
2021-01-22 10:24:53 +01:00
f92289f5a7
[tx-robot] updated from transifex
2021-01-22 02:20:07 +00:00
9d8b597605
silence log message
...
- this appears too often (in some configurations) when qualifying group
members which do not meet the criteria
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-21 21:09:57 +00:00
e0598117e1
also use storage copy when dav copying directories
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-21 21:08:58 +00:00
b7d8b3a72d
Fix encoding issue with OC.Notification.show
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-21 10:43:20 +01:00
5f5203a285
[tx-robot] updated from transifex
2021-01-21 02:20:47 +00:00
1dcfab0d76
Merge pull request #25225 from nextcloud/backport/24600/stable20
...
[stable20] Update handling of user credentials
2021-01-20 14:57:48 +01:00
fcdbd4eca3
Fix potential empty result
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 10:11:56 +01:00
85781d8d36
Compare and store the login name via the event
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 09:09:15 +01:00
ae48e26d37
Merge pull request #25219 from nextcloud/backport/25216/stable20
...
[stable20] Bump CA bundle
2021-01-20 09:08:14 +01:00
0c7f0a7d89
Also fix the username when it changed
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 09:08:08 +01:00
8e3e1f9a32
Don't save credentials of another user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-20 09:08:00 +01:00
37f3195c6b
[tx-robot] updated from transifex
2021-01-20 02:21:05 +00:00
3c1a9a5e66
Bump CA bundle
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-19 21:56:28 +00:00
0855173ae1
Merge pull request #25203 from nextcloud/version/20.0.6/RC1
...
20.0.6 RC1
2021-01-19 14:52:34 +01:00
c442f49162
20.0.6 RC1
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-19 13:48:34 +01:00
8395819a93
Merge pull request #25199 from nextcloud/update-3rdparty
...
[stable20] Update 3rdparty after Archive_Tar
2021-01-19 13:41:50 +01:00
31b704038a
Update 3rdparty after Archive_Tar
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-19 13:05:00 +01:00
18d43a012b
Merge pull request #25190 from nextcloud/backport/25181/stable20
...
[stable20] Update CRL due to revoked gravatar.crl
2021-01-19 09:35:00 +01:00
b04d566c89
Merge pull request #25193 from nextcloud/backport/25186/stable20
...
[stable20] Don't log keys on checkSignature
2021-01-19 09:34:49 +01:00
f94215a58e
[tx-robot] updated from transifex
2021-01-19 02:20:55 +00:00
aa309afc59
Don't log keys on checkSignature
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-18 21:26:01 +00:00
55da2dce39
Update CRL due to revoked gravatar.crl
...
https://github.com/nextcloud/app-certificate-requests/pull/362
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-01-18 19:25:13 +00:00
2c643d7b9f
Merge pull request #25178 from nextcloud/backport/25176/stable20
...
[stable20] Add "composer.lock" for acceptance tests to git
2021-01-18 13:33:33 +01:00
26a6e46eb3
Add "composer.lock" for acceptance tests to git
...
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>
2021-01-18 11:52:30 +00:00
63a8349e1b
[tx-robot] updated from transifex
2021-01-18 02:19:40 +00:00
71f57e0b5e
Merge pull request #25152 from nextcloud/backport/25138/stable20
...
[stable20] Fix comparison of PHP versions
2021-01-17 21:16:34 +01:00
6ef830a7d9
[tx-robot] updated from transifex
2021-01-17 02:20:08 +00:00
996d6ce994
[tx-robot] updated from transifex
2021-01-16 02:20:15 +00:00
8103fd98d1
Update psalm baseline to allow warning of implicit cast to string
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-01-15 16:55:47 +01:00
5ec9ce0bf1
Merge pull request #25146 from nextcloud/backport/25142/stable20
...
[stable20] Do not redirect to logout after login
2021-01-15 16:45:36 +01:00
151abca91c
Fix comparison of PHP versions
...
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>
2021-01-15 14:20:51 +00:00
23f466fb10
Do not redirect to logout after login
...
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>
2021-01-15 10:56:18 +00:00
ac14e42b49
Merge pull request #25143 from nextcloud/backport/25141/stable20
...
[stable20] Add a hint about the direction of priority
2021-01-15 10:10:04 +01:00
b07ff57b2b
Add a hint about the direction of priority
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-15 08:49:19 +00:00
48eea6f74b
Merge pull request #25077 from nextcloud/backport/25034/stable20
...
[stable20] Make sure to do priority app upgrades first
2021-01-15 09:31:57 +01:00
7c8d3709d9
[tx-robot] updated from transifex
2021-01-15 02:20:37 +00:00
591c4fdd02
Merge pull request #25120 from nextcloud/backport/25036/stable20
...
[stable20] respect DB restrictions on number of arguments in statements and queries
2021-01-14 21:40:54 +01:00
6404627d0c
adjust tests
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-14 16:33:13 +00:00
e0d85ed9a8
dont offer to edit external config settings if we can't edit them
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-01-14 16:33:13 +00:00
26f77d879e
CI satisfaction
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:16:02 +01:00
5dd7665f21
silence psalm false positive
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:04:02 +01:00
b82efbdee5
DB: warn on parameter number constraints
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:03:54 +01:00
b0ea654653
respect DB limits limit per statement and query
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-01-14 13:03:36 +01:00
1ef9a3f039
Merge pull request #25102 from nextcloud/version/20.0.5/final
...
20.0.5
2021-01-14 10:22:39 +01:00
Morris Jobke
Roeland Jago Douma
Roeland Jago Douma
blizzz
Robin Appelman
Nextcloud bot
Joas Schilling
Daniel Calviño Sánchez
Damien Goutte-Gattat