684bb8608d
Do not run fragile TrashbinTest
...
Fails with:
There was 1 failure:
1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.
/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186
OR
1) TrashbinTest::testExpireOldFiles
Failed asserting that null is identical to 'file2.txt'.
/drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 22:16:27 +01:00
cdb3602671
Merge pull request #14661 from nextcloud/backport/14656/stable15
...
[stable15] prevent recursion when moving a file to the trashbin
2019-03-13 21:46:42 +01:00
57471cca04
prevent recursion when moving a file to the trashbin
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-13 16:17:30 +00:00
1c7f091272
Merge pull request #14658 from nextcloud/backport/14644/stable15
...
[stable15] Remove sensitive SMB arguments from exception log
2019-03-13 17:15:25 +01:00
144cf16221
Remove sensitive SMB arguments from exception log
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 13:00:57 +00:00
42cd3876d4
Merge pull request #14597 from nextcloud/backport/14425/stable15
...
[stable15] Do not calculate folder size for parent that also needs proper scan, fixes #3524
2019-03-08 17:31:54 +01:00
e957b0a271
Merge pull request #14591 from nextcloud/backport/14464/stable15
...
[stable15] resolve user and groups in nested groups first before filtering the results
2019-03-08 17:31:39 +01:00
1b53d46466
Merge pull request #14596 from nextcloud/backport/14587/stable15
...
[stable15] Remove Google+ from Social Sharing Bundle
2019-03-08 17:30:14 +01:00
634390a299
Merge pull request #14534 from nextcloud/backport/14502/add-activities-for-group-membership-changes
...
[stable15] Add activities for group membership changes
2019-03-08 10:26:01 +01:00
a7a39de878
Merge pull request #14599 from nextcloud/backport/14585/stable15
...
[stable15] Mention Open Cloud Mesh in Federated User Settings
2019-03-08 10:25:20 +01:00
a4fd78a011
Merge pull request #14601 from nextcloud/backport/14590/stable15
...
[stable15] Update index.php
2019-03-08 09:51:35 +01:00
8e14d232d4
Update index.php
...
Linking to NC 15 documentation instead of NC 13
2019-03-08 08:46:30 +00:00
d0fdcbbd20
Mention Open Cloud Mesh in Federated User Settings
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-08 08:43:19 +00:00
264b4ad3a9
Avoid calculating folder size for parent that needs scan.
...
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-08 08:14:33 +00:00
7fa1cfcb17
Remove Google+ from Social Sharing Bundle (2)
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-08 08:06:52 +00:00
7cd7750140
Remove "socialsharing_googleplus" from Social Sharing Bundle
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-08 08:06:51 +00:00
a358c4d81f
remove unused use statement
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:54 +01:00
5c21e94db8
add missing config bits to integration tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:48 +01:00
3ea24fa630
with LDAP server set offline, config cannot be controlled via ocs anymore
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:41 +01:00
a6c0d53a3e
fix nested group retrieval also for 2 other cases
...
and also consolidate logic in one method
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-07 22:39:25 +01:00
3384e25154
Fixed unit test: groupsMatchFilter will not be called multiple times anymore.
...
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:38:15 +01:00
0a469e8f23
Reduce queries to LDAP by caching nested groups
...
Nested groups are now cached in a CappedMemoryCache object to reduce
queries to the LDAP backend.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:37:21 +01:00
0997fd999e
user_ldap: really resolve nested groups
...
The previous patch fixed the problem only for one level of indirection
because groupsMatchFilter() had been applied on each recursive call (and
thus there would be no second level if the first level fails the check).
This new implementation replaces the recursive call with a stack that
iterates all nested groups before filtering with groupsMatchFilter().
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:36:21 +01:00
fe169b021d
user_ldap: Filter groups after nexted groups
...
Currently groupsMatchFilter is called before nested groups are resolved.
This basicly breaks this feature since it is not possible to inherit
membership in a group from another group.
Minimal example:
Group filter: (&(objectClass=group),(cn=nextcloud))
Nested groups: enabled
cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local
objectClass: group
cn=IT,ou=groups,dn=company,dn=local
objectClass: group
memberOf: cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local
cn=John Doe,ou=users,dn=company,dn=local
objectClass: person
memberOf: cn=IT,ou=groups,dn=company,dn=local
Since 'cn=IT,ou=groups,dn=company,dn=local' doesn't match the group
filter, John wouldn't be a member of group 'nextcloud'.
This patch fixes this by filtering the groups after all nested groups
have been collected. If nested groups is disabled the result will be the
same as without this patch.
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-07 22:36:14 +01:00
95bc1a0198
Merge pull request #14580 from nextcloud/backport/14579/stable15
...
[stable15] Have streams of files_external in sync
2019-03-07 15:02:16 +01:00
f5f4673827
Have streams of files_external in sync
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-07 12:59:47 +01:00
fee02bbcaa
Fix unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-07 10:04:22 +01:00
3de750c88c
Merge pull request #14570 from nextcloud/backport/14424/stable15
...
[stable15] Use a tmp file for swift writes
2019-03-06 20:35:46 +01:00
30e790606e
Use a tmp file for swift writes
...
Else this leads to a seekable stream error with chunked uploads
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-06 14:34:15 +00:00
3acee4f1b4
Merge pull request #14416 from nextcloud/backport/14343/stable15
...
[stable15] Parse multiple navigation items
2019-03-06 13:16:25 +01:00
0da0ee1ce4
Merge pull request #14559 from nextcloud/backport/14553/stable15
...
[stable15] Clear backupcode reminder when no 2fa
2019-03-06 11:57:03 +01:00
390917a9e5
Do not send notification if no active 2fa
...
If the job is still present we should also not fire it off if there is
not a single active 2FA provider.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-06 09:17:38 +00:00
f42309f356
Clear backupcodes reminder if no 2FA is enabled
...
Fixes #14125
Listen to 2FA disable event. If a provider is disabled for a user. We
check if there are no more providers. If there are no more providers we
Remove the backupcode reminder notification (if still present).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-06 09:17:38 +00:00
4f4dad20fa
Merge pull request #14546 from nextcloud/backport/14373/stable15
...
[stable15] Add test for updated CA bundle
2019-03-05 19:52:35 +01:00
46061d9d6b
DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-05 16:14:44 +00:00
d2e12d6aa7
Add test for updated CA bundle
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 16:14:44 +00:00
30e9a17790
Merge pull request #14542 from nextcloud/backport/14451/stable15
...
[stable15] Check if password can be changed for the users backend in OCS api
2019-03-05 16:19:22 +01:00
37ba2562cf
Check if password can be changed for the users backend in OCS api
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-05 13:28:05 +00:00
b88eb01798
Merge pull request #14531 from nextcloud/backport/14528/stable15
...
[stable15] Fix database configuration
2019-03-05 12:23:22 +01:00
e828bfca1e
Update autoloader
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 11:32:00 +01:00
8c67f36f98
Add activities for group membership changes
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 11:29:56 +01:00
facde54bf5
Fix whitespaces
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 10:02:09 +00:00
6cc0d9fa20
Fix database configuration
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-05 10:02:08 +00:00
6e5a93026c
Merge pull request #14517 from nextcloud/backport/13871/stable15
...
[stable15] dav: Fix handling of chunked WebDAV upload
2019-03-05 10:05:25 +01:00
0f95b95a24
Merge pull request #14516 from nextcloud/backport/14499/stable15
...
[stable15] Do not cut full color on accessibility svg color invert
2019-03-05 10:02:28 +01:00
ec9e82a689
Merge pull request #14521 from nextcloud/backport/14514/stable15
...
[stable15] Do not just write foobar
2019-03-05 10:00:44 +01:00
3d5904b5cc
Do not just write foobar
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-04 20:26:59 +00:00
b89b7ae885
Merge pull request #14512 from nextcloud/smb-3.0.2-15
...
update icewind/smb to 3.0.2
2019-03-04 17:45:25 +01:00
6c5c01974f
dav: Fix handling of chunked WebDAV upload
...
When $data is null (which can happen when $request->getBodyAsStream() returns
null), the Exceptions says "copied bytes: 0, expected filesize: 0", which
sounds more like success...
2019-03-04 16:44:21 +00:00
2ca4473e28
Do not cut full color on accessibility svg color invert
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-03-04 16:40:03 +00:00
Morris Jobke
Roeland Jago Douma
Robin Appelman
paul
Marius Blüm
Ari Selseng
Arthur Schiwon
Roland Tapken
Roeland Jago Douma
Joas Schilling
Daniel Kesselberg
Julius Härtl
Jan-Philipp Litza
John Molakvoæ (skjnldsv)