Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Nextcloud
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

fc4d0a86

Unverified Commit fc4d0a86 authored 8 years ago by Roeland Jago Douma

Downloads
- Patches
- Plain Diff

Fix merging backend results


* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

parent ce7eb026

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

apps/dav/lib/Connector/Sabre/SharesPlugin.php 4 additions, 1 deletion

apps/dav/lib/Connector/Sabre/SharesPlugin.php
apps/federatedfilesharing/lib/FederatedShareProvider.php 1 addition, 1 deletion

apps/federatedfilesharing/lib/FederatedShareProvider.php
lib/private/Share20/DefaultShareProvider.php 2 additions, 1 deletion

lib/private/Share20/DefaultShareProvider.php
lib/private/Share20/Manager.php 9 additions, 1 deletion

lib/private/Share20/Manager.php

with 16 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment