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

d636e168

Commit d636e168 authored 11 years ago by Florin Peter

Downloads
- Plain Diff

Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes

File encryption external storage fixes

parents a730a72d eaa4f922

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/hooks/hooks.php 13 additions, 10 deletions

apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/helper.php 14 additions, 0 deletions

apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php 2 additions, 2 deletions

apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/proxy.php 59 additions, 99 deletions

apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/util.php 39 additions, 30 deletions

apps/files_encryption/lib/util.php
apps/files_encryption/tests/webdav.php 1 addition, 1 deletion

apps/files_encryption/tests/webdav.php
apps/files_versions/lib/versions.php 17 additions, 0 deletions

apps/files_versions/lib/versions.php
lib/public/share.php 49 additions, 35 deletions

lib/public/share.php

with 194 additions and 177 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