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

3fa651f2

Commit 3fa651f2 authored 11 years ago by Vincent Petry

Downloads
- Plain Diff

Merge pull request #5447 from owncloud/fixing-5117-master

No data corruption duriing parallel upload

parents dc300560 77429c28

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/lib/helper.php 43 additions, 0 deletions

apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php 6 additions, 48 deletions

apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/proxy.php 3 additions, 3 deletions

apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/util.php 1 addition, 4 deletions

apps/files_encryption/lib/util.php
apps/files_encryption/tests/helper.php 54 additions, 0 deletions

apps/files_encryption/tests/helper.php
apps/files_encryption/tests/keymanager.php 0 additions, 17 deletions

apps/files_encryption/tests/keymanager.php
lib/private/connector/sabre/file.php 25 additions, 3 deletions

lib/private/connector/sabre/file.php

with 132 additions and 75 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