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

5b7b0536

Commit 5b7b0536 authored 11 years ago by Thomas Müller

Downloads
- Plain Diff

Merge pull request #5976 from owncloud/encryption_work_with_public_gallery

Encryption work with public gallery

parents a8190909 7f2bdb0e

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/lib/helper.php 37 additions, 6 deletions

apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php 18 additions, 20 deletions

apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/proxy.php 5 additions, 4 deletions

apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/stream.php 15 additions, 9 deletions

apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php 37 additions, 47 deletions

apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php 10 additions, 6 deletions

apps/files_encryption/tests/crypt.php
apps/files_encryption/tests/keymanager.php 1 addition, 1 deletion

apps/files_encryption/tests/keymanager.php

with 123 additions and 93 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