Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5a8d3702

Commit 5a8d3702 authored 11 years ago by Björn Schießle

Downloads
- Plain Diff

Merge pull request #7155 from owncloud/enc_improved_error_handling

[encryption] improved error handling

parents 750ffa82 6778dc5a

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/ajax/getMigrationStatus.php 3 additions, 5 deletions

apps/files_encryption/ajax/getMigrationStatus.php
apps/files_encryption/appinfo/app.php 1 addition, 0 deletions

apps/files_encryption/appinfo/app.php
apps/files_encryption/hooks/hooks.php 17 additions, 12 deletions

apps/files_encryption/hooks/hooks.php
apps/files_encryption/js/detect-migration.js 5 additions, 1 deletion

apps/files_encryption/js/detect-migration.js
apps/files_encryption/js/encryption.js 12 additions, 0 deletions

apps/files_encryption/js/encryption.js
apps/files_encryption/lib/util.php 59 additions, 32 deletions

apps/files_encryption/lib/util.php
apps/files_encryption/tests/util.php 79 additions, 2 deletions

apps/files_encryption/tests/util.php
settings/ajax/decryptall.php 8 additions, 1 deletion

settings/ajax/decryptall.php

with 184 additions and 53 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