mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
46,200 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

46200 Commits

Author SHA1 Message Date
Morris Jobke 5cdb4f97e3
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:20:13 +01:00
Morris Jobke 33682c4e3b
Merge pull request #14659 from nextcloud/backport/14644/stable14 
[stable14] Remove sensitive SMB arguments from exception log
 2019-03-13 17:15:14 +01:00
Morris Jobke 9ddff52753 Remove sensitive SMB arguments from exception log 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 13:01:48 +00:00
Morris Jobke c9b87701d0
Merge pull request #14598 from nextcloud/backport/14425/stable14 
[stable14] Do not calculate folder size for parent that also needs proper scan, fixes #3524
 2019-03-08 17:32:16 +01:00
Morris Jobke 67aab99962
Merge pull request #14592 from nextcloud/backport/14464/stable14 
[stable14] resolve user and groups in nested groups first before filtering the results
 2019-03-08 17:31:30 +01:00
Morris Jobke 48b707bf35
Merge pull request #14595 from nextcloud/backport/14587/stable14 
[stable14] Remove Google+ from Social Sharing Bundle
 2019-03-08 17:30:31 +01:00
Morris Jobke f4a6e6fadb
Merge pull request #14600 from nextcloud/backport/14585/stable14 
[stable14] Mention Open Cloud Mesh in Federated User Settings
 2019-03-08 10:25:39 +01:00
Marius Blüm 9c8bcf9c62 Mention Open Cloud Mesh in Federated User Settings 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-08 08:43:21 +00:00
Ari Selseng 3ff6465cdc 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
Marius Blüm b8470f30bd Remove Google+ from Social Sharing Bundle (2) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-08 08:06:52 +00:00
Marius Blüm 2f179cb327 Remove "socialsharing_googleplus" from Social Sharing Bundle 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-08 08:06:51 +00:00
Arthur Schiwon 7fa490fde4
remove unused use statement 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-03-07 22:47:40 +01:00
Arthur Schiwon 0867fa6623
add missing config bits to integration tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-03-07 22:47:30 +01:00
Arthur Schiwon 12e5fe00d9
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:47:14 +01:00
Arthur Schiwon a23ef68ffe
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:47:06 +01:00
Roland Tapken a202fc808d
Fixed unit test: groupsMatchFilter will not be called multiple times anymore. 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2019-03-07 22:46:20 +01:00
Roland Tapken f88a09140d
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:46:14 +01:00
Roland Tapken 177901d079
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:46:08 +01:00
Roland Tapken 8f57824707
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:45:58 +01:00
Roeland Jago Douma 8ca4bc7a9e
Merge pull request #14547 from nextcloud/backport/14373/stable14 
[stable14] Add test for updated CA bundle
 2019-03-05 19:52:48 +01:00
Daniel Kesselberg a68c72ac6e DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-03-05 16:15:27 +00:00
Morris Jobke e79907e6f6 Add test for updated CA bundle 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-05 16:15:27 +00:00
Morris Jobke 0532077969
Merge pull request #14543 from nextcloud/backport/14451/stable14 
[stable14] Check if password can be changed for the users backend in OCS api
 2019-03-05 16:26:14 +01:00
Morris Jobke 45af4e6ea3
Merge pull request #14417 from nextcloud/backport/14343/stable14 
[stable14] Parse multiple navigation items
 2019-03-05 15:06:23 +01:00
Julius Härtl 05f3abaf6b 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:47 +00:00
Morris Jobke f7af3af72a
Merge pull request #14533 from nextcloud/backport/14528/stable14 
[stable14] Fix database configuration
 2019-03-05 12:21:44 +01:00
Joas Schilling 59c62d01ec Fix whitespaces 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-05 10:02:13 +00:00
Joas Schilling e84498784e Fix database configuration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-05 10:02:13 +00:00
Roeland Jago Douma 21dd025760
Merge pull request #14513 from nextcloud/smb-3.0.2-14 
update icewind/smb to 3.0.2
 2019-03-04 21:28:20 +01:00
Morris Jobke 7610e38089
Merge pull request #14504 from nextcloud/backport/stable14/14390 
[stable14] Fix expire date change eventhandler
 2019-03-04 17:34:59 +01:00
Robin Appelman 79abac9084
update icewind/smb to 3.0.2 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-04 16:38:46 +01:00
Julius Härtl f7609eedad
Add handler for change event of the expire date field 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-03-04 14:59:29 +01:00
Morris Jobke 38f1d9e6f1
Merge pull request #14498 from nextcloud/backport/14494/stable14 
[stable14] Make header.feature more robust by running it on apache
 2019-03-04 12:37:25 +01:00
Morris Jobke edeb695d14
Merge pull request #14496 from nextcloud/backport/14440/stable14 
[stable14] Run tests that fail with "no such process" over to apache server
 2019-03-04 11:32:43 +01:00
Morris Jobke a3ff98c282 Make header.feature more robust by running it on apache 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-04 10:09:32 +00:00
Morris Jobke 7f010dba25 Run tests that fail with "no such process" over to apache server 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-04 09:23:20 +00:00
Morris Jobke 21fe11fc2a
Merge pull request #14491 from nextcloud/backport/14489/stable14 
[stable14] Add accessibility translations
 2019-03-03 23:24:45 +01:00
John Molakvoæ (skjnldsv) 2d8dccbe0b Add accessibility translations 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-03-03 22:23:47 +00:00
Nextcloud bot affd0dcaf2
[tx-robot] updated from transifex 2019-03-01 01:12:57 +00:00
Roeland Jago Douma 84c2dfd442
Merge pull request #14415 from nextcloud/backport/13844/stable14 
[stable14] Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
 2019-02-28 09:43:31 +01:00
Nextcloud bot 1d33283332
[tx-robot] updated from transifex 2019-02-28 01:12:58 +00:00
Morris Jobke c1c7491a2e
Merge pull request #14421 from nextcloud/version/noid/14.0.8 
14.0.8
 2019-02-27 21:33:46 +01:00
Morris Jobke 4b15f1df52
14.0.8 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-02-27 17:29:02 +01:00
Daniel Kesselberg b7570092f7 two item => two items 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:37 +00:00
Daniel Kesselberg 3e1f327ac9 Generate id for navigation item 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:36 +00:00
Daniel Kesselberg 70edd2b633 Parse multiple navigation items 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:36 +00:00
Felix Nieuwenhuizen 39cbc6e09e Fix for issue 10862: calculation of free space ignores external storage (doesn't count towards quota) 
Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
 2019-02-27 14:56:54 +00:00
Nextcloud bot a05e578d36
[tx-robot] updated from transifex 2019-02-27 01:12:27 +00:00
Nextcloud bot 18cbf6445d
[tx-robot] updated from transifex 2019-02-26 09:10:22 +00:00
Nextcloud bot 1274001632
[tx-robot] updated from transifex 2019-02-26 01:12:30 +00:00