Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

bd888748

Commit bd888748 authored 10 years ago by Vincent Petry

Downloads
- Plain Diff

Merge pull request #13490 from owncloud/fix_reshare_s2s_share

use uid provided by setupfs hook to mount server2server shares

parents 44d69d71 5ba19ba7

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_sharing/ajax/external.php 2 additions, 2 deletions

apps/files_sharing/ajax/external.php
apps/files_sharing/api/server2server.php 3 additions, 2 deletions

apps/files_sharing/api/server2server.php
apps/files_sharing/application.php 4 additions, 2 deletions

apps/files_sharing/application.php
apps/files_sharing/lib/controllers/sharecontroller.php 0 additions, 1 deletion

apps/files_sharing/lib/controllers/sharecontroller.php
apps/files_sharing/lib/external/manager.php 50 additions, 28 deletions

apps/files_sharing/lib/external/manager.php
apps/files_sharing/lib/hooks.php 2 additions, 2 deletions

apps/files_sharing/lib/hooks.php
apps/files_sharing/tests/server2server.php 3 additions, 2 deletions

apps/files_sharing/tests/server2server.php
lib/private/security/certificatemanager.php 23 additions, 19 deletions

lib/private/security/certificatemanager.php
lib/private/server.php 8 additions, 5 deletions

lib/private/server.php
tests/lib/security/certificatemanager.php 3 additions, 5 deletions

tests/lib/security/certificatemanager.php

with 98 additions and 68 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