Commit Graph

44542 Commits

Author SHA1 Message Date
Arthur Schiwon 552da85df8
Iron User_LDAP tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-07-03 00:29:34 +02:00
Morris Jobke aa64584d67
Merge pull request #10080 from nextcloud/bugfix/noid/fix-phan-warning
Fix undeclared method warning in phan
2018-07-02 17:40:39 +02:00
Morris Jobke 48b7499fa4
Merge pull request #10079 from nextcloud/search-double-slash
fix double slash in search result path when the result is in a submount
2018-07-02 15:49:27 +02:00
Morris Jobke 6e9dbe7d15
Merge pull request #10078 from nextcloud/bugfix/activity-277/invalid-actor-and-calendar-for-link-shares
Correctly parse the subject parameters for link (un)shares of calendars
2018-07-02 15:43:36 +02:00
Morris Jobke f3093b2401
Fix undeclared method warning in phan
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-02 15:38:49 +02:00
Morris Jobke fe807823d2
Merge pull request #10077 from nextcloud/lazy-search-fix
Fix lazy search backend
2018-07-02 15:37:29 +02:00
Robin Appelman 922c851494
fix double slash in search result path when the result is in a submount
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-02 14:17:38 +02:00
Joas Schilling a0a6aff772
Correctly parse the subject parameters for link (un)shares of calendars
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-02 13:57:48 +02:00
Robin Appelman 1f9f5e2e5e
Fix lazy search backend
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-02 13:42:41 +02:00
Bjoern Schiessle 7ff74ae8ed
cache results from ocm end-point discovery
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle ce567b6121
remove unused code
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle 411bae5163
fix return type from send share
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Bjoern Schiessle 511a34b08f
always enable cloud federation api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 12:43:43 +02:00
Morris Jobke 6142cd6fb4
Merge pull request #10070 from weeman1337/bug9949-2
Updates the maintenance command output
2018-07-02 12:21:11 +02:00
Bjoern Schiessle cdf8abb060
look for correct OCM permissions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
Bjoern Schiessle 086e7a0aa2
remove debug output 2018-07-02 11:29:31 +02:00
Bjoern Schiessle cfb3e80d1b
remove the makefile 2018-07-02 11:29:31 +02:00
Bjoern Schiessle 8d4da30bf5
add support for different share types
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
Bjoern Schiessle e251b34a8c
cleanup variable naming, it is actually a resource type
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:31 +02:00
Bjoern Schiessle 5c8b26248b
let the actual federated share provider check if incoming/outgoing shares are enabled for the specific resource type
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 22d9246134
send the display name back after a federated share was received
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 27814127dd
make sure that remote url gets stored with a trailing '/'
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 21b8a873d5
implement config check
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 9365fd2534
fix external manager tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 2e19213695
fix notification tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 9d145bb5dd
update tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:30 +02:00
Bjoern Schiessle 5d0d33a0d4
remove unused method
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 34c4527cc4
add ocm-provider to the list of expected files
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 84fc188dfc
some minor fixes and clode cleanup
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 957b27f282
replace \OCP\Federation\Exception\ShareNotFoundException with the generic \OCP\Share\Exception\ShareNotFound exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 61485e3e60
fix check for reshare permissions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle ed415726d3
send RESHARE_CHANGE_PERMISSION message
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle 2bb1956c1f
implement RESHARE_UNDO notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle d77eedd23b
- Don't remove share before all notifications are created, otherwise we miss information necessary to create the notifications
- Don't send message to owner/sharer about revoked re-shares twice.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:29 +02:00
Bjoern Schiessle a176a1f318
implement unshare notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle fab4e561f4
send reshare over OCM API
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle 41a1528888
implement decline share
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle b7b84305a3
fix capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle c572e84ad9
detect correctly if a share was send successful
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle 8889e14c7c
implement accept share notification
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle bbce8c3ea1
adjust to latest api version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:28 +02:00
Bjoern Schiessle daba042d26
update capabilities
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle af178ef19a
check API Version
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle db428ea547
send accept share notification (WIP)
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle a3948e8a12
use new API to send a federated share if possible
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle 6208f250e8
check if cloud federation api is ready
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle 4c8f3d6d77
add cloud federation api app
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle 21e64ec7f4
implement receiving of federated shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Bjoern Schiessle 5cfe20675d
start implementing federated sharing 2.0
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-07-02 11:29:27 +02:00
Roeland Jago Douma 22bb834c48
Merge pull request #10071 from nextcloud/apps-fix-message-translation
Fix hardcoded messages in app details view
2018-07-02 09:39:20 +02:00