Morris Jobke
389c2095a6
Use dependency injection for app manager
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 00:42:39 +01:00
Vinicius Cubas Brand
9bb13fb05f
Created infrastructure to show circles' shared files
...
There is a proposal to allow users to filter files shared to circles. This commit is needed to provide the infrastucture for it.
Issue: https://github.com/nextcloud/circles/issues/137
Changes to comply to https://github.com/coletivoEITA/circles/pull/2
Polishing: get files shared to circles in caldav
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-13 00:31:38 +01:00
Morris Jobke
f0c85a0f5f
Merge pull request #6512 from coletivoEITA/add_circles_sharing_to_caldav
...
Change CALDAV to allow calendars be shared with circles.
2019-03-13 00:06:46 +01:00
Morris Jobke
5cc5107cba
Fix PHPUnit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-12 18:41:37 +01:00
Morris Jobke
c8aad3db81
Fix PHPUnit
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-12 18:27:59 +01:00
Morris Jobke
89ed84e8b6
Fix display of i in personal settings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-11 12:47:14 +01:00
Marius Blüm
ab488a49d0
Add hint to user documentation (Federation)
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-11 12:47:14 +01:00
Morris Jobke
ec5f4200ad
Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-container-creation
...
Avoid duplicate App container creation
2019-03-08 10:31:10 +01:00
Morris Jobke
49c7799496
Merge pull request #14585 from nextcloud/ocm-mention-federation
...
Mention Open Cloud Mesh in Federated User Settings
2019-03-08 09:42:22 +01:00
Morris Jobke
3f8235da62
Merge pull request #14583 from nextcloud/remove-g+-federation
...
Remove Google+ federation usersettings
2019-03-08 09:04:01 +01:00
blizzz
3af7f2c2ea
Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filter
...
resolve user and groups in nested groups first before filtering the results
2019-03-07 22:31:51 +01:00
Marius Blüm
993e15b72c
Remove G+ CSS rule (Feedback from Joas)
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 14:28:36 +01:00
Marius Blüm
6c2b80170e
Mention Open Cloud Mesh in Federated User Settings
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:55:09 +01:00
Marius Blüm
bdad72dfa9
Remove G+ code from Federated Files Sharing-usersettings
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:46:49 +01:00
Marius Blüm
500986f30e
Remove G+ icon from Federated Files Sharing-usersettings
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2019-03-07 13:45:23 +01:00
Roeland Jago Douma
7ff1f8366a
Merge pull request #14579 from nextcloud/fix/bump_streams_files_external
...
Have streams of files_external in sync
2019-03-07 12:53:07 +01:00
Roeland Jago Douma
bb3c3539cc
Have streams of files_external in sync
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-07 12:15:32 +01:00
Morris Jobke
5c6a46314a
Fix transifex sync for files_sharing
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-06 15:02:07 +01:00
Morris Jobke
88f0697cb9
Update generated webpack files to .l10nignore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-06 14:27:11 +01:00
Morris Jobke
bdf95ef0ec
Merge pull request #14558 from nextcloud/fix/13790/fix-comment
...
Fix unnecessary boolean cast
2019-03-06 11:42:14 +01:00
Joas Schilling
e13253c66a
"Fix" the unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-03-06 11:06:03 +01:00
Morris Jobke
58f6a777b1
Merge pull request #14553 from nextcloud/fix/14125/clear_backupcode_reminder_when_no_2fa
...
Clear backupcode reminder when no 2fa
2019-03-06 10:16:58 +01:00
Morris Jobke
4b49e2eb52
Fix unnecessary boolean cast
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-06 10:12:58 +01:00
Morris Jobke
fde4c54136
Merge pull request #13790 from fretn/master
...
Fix for crashing occ files:scan
2019-03-06 10:12:14 +01:00
Arthur Schiwon
e36cede994
remove unused use statement
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-03-06 00:34:29 +01:00
Roeland Jago Douma
3d17ab0936
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-05 20:21:37 +01:00
Roeland Jago Douma
1c29a01956
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-05 20:14:16 +01:00
Morris Jobke
dd2496b275
Use proper dependency injection for app manager
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 16:00:47 +01:00
Morris Jobke
789aaa489d
Fix whitespace
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:48:50 +01:00
Morris Jobke
8322cec951
Suppress phan exceptions because they are catched by a class_exists
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 15:46:56 +01:00
Julius Härtl
add43bc19c
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:44:25 +01:00
Arthur Schiwon
5dd2207c95
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-05 11:07:40 +01:00
Roland Tapken
459b8a4845
Fixed unit test: groupsMatchFilter will not be called multiple times anymore.
...
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
2019-03-05 11:07:40 +01:00
Roland Tapken
e7c506cff1
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-05 11:07:40 +01:00
Roland Tapken
afb182650e
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-05 11:07:40 +01:00
Roland Tapken
c2d8a36d9a
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-05 11:07:35 +01:00
Morris Jobke
a4585b35c0
Fix missing $config dependency in RetryJob
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2019-03-05 10:08:27 +01:00
Morris Jobke
679afa251b
Merge pull request #14519 from nextcloud/feature/config-undefined
...
Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
2019-03-05 10:06:09 +01:00
Morris Jobke
ede5f4486a
Merge pull request #14470 from felixn/master
...
use node API for free space calculation in versions app
2019-03-05 09:40:11 +01:00
Roeland Jago Douma
243bc96ad9
Merge pull request #14480 from cowai/reconnect-db-notify
...
Reconnect to DB after timeout for Notify command. Fixes #14479
2019-03-04 21:36:12 +01:00
Roeland Jago Douma
eb175584f6
Merge pull request #14514 from nextcloud/fix/no_debug_output
...
Do not just write foobar
2019-03-04 21:26:20 +01:00
Daniel Kesselberg
7406f42fdf
Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$config
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-03-04 19:12:46 +01:00
Morris Jobke
79ec7bbcf6
Merge pull request #13871 from PLUTEX/master
...
dav: Fix handling of chunked WebDAV upload
2019-03-04 17:43:31 +01:00
Morris Jobke
36b7fc7bef
Merge pull request #14499 from nextcloud/fix/svg-api/dark-mode
...
Do not cut full color on accessibility svg color invert
2019-03-04 17:39:24 +01:00
Roeland Jago Douma
c8d1b29407
Do not just write foobar
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-03-04 17:14:32 +01:00
Robin Appelman
41f8bfbe93
update icewind/smb to 3.1.1
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-03-04 16:41:22 +01:00
Ari Selseng
1ac9a9a1bb
Correct log attribute
...
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-04 15:02:15 +01:00
Roeland Jago Douma
138fdf0793
Merge pull request #13401 from nextcloud/improve-lookup-server-behaviour
...
improve lookup server behaviour
2019-03-04 14:25:24 +01:00
Ari Selseng
3218e0f70d
Added logging to Notify command.
...
Signed-off-by: Ari Selseng <ari@selseng.net>
2019-03-04 14:23:13 +01:00
Morris Jobke
bbb168a8ba
Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-setting
...
Remove the upload and memory setting
2019-03-04 13:32:37 +01:00