Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

41ff001b

Unverified Commit 41ff001b authored 6 years ago by Roeland Jago Douma Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation

Sharing user consolidation

parents 51418582 ffc32222

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

apps/dav/lib/CardDAV/AddressBookImpl.php 29 additions, 6 deletions

apps/dav/lib/CardDAV/AddressBookImpl.php
apps/files_sharing/css/sharetabview.scss 27 additions, 2 deletions

apps/files_sharing/css/sharetabview.scss
core/css/icons.scss 4 additions, 0 deletions

core/css/icons.scss
core/css/jquery-ui-fixes.scss 6 additions, 2 deletions

core/css/jquery-ui-fixes.scss
core/js/sharedialogview.js 99 additions, 11 deletions

core/js/sharedialogview.js
lib/private/Collaboration/Collaborators/MailPlugin.php 19 additions, 2 deletions

lib/private/Collaboration/Collaborators/MailPlugin.php
lib/private/Collaboration/Collaborators/RemotePlugin.php 58 additions, 11 deletions

lib/private/Collaboration/Collaborators/RemotePlugin.php
lib/public/IAddressBook.php 8 additions, 6 deletions

lib/public/IAddressBook.php
tests/lib/Collaboration/Collaborators/MailPluginTest.php 99 additions, 15 deletions

tests/lib/Collaboration/Collaborators/MailPluginTest.php
tests/lib/Collaboration/Collaborators/RemotePluginTest.php 46 additions, 6 deletions

tests/lib/Collaboration/Collaborators/RemotePluginTest.php

with 395 additions and 61 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