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

b8de1e5d

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

Downloads
- Plain Diff

Merge pull request #8398 from owncloud/enc_backup_keys

backup the encryption key after the encryption was disabled

parents e934129b a9ac1171

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

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

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

apps/files_encryption/tests/util.php
lib/private/util.php 28 additions, 8 deletions

lib/private/util.php
settings/ajax/deletekeys.php 17 additions, 0 deletions

settings/ajax/deletekeys.php
settings/ajax/restorekeys.php 24 additions, 0 deletions

settings/ajax/restorekeys.php
settings/js/personal.js 52 additions, 9 deletions

settings/js/personal.js
settings/personal.php 5 additions, 1 deletion

settings/personal.php
settings/routes.php 4 additions, 0 deletions

settings/routes.php
settings/templates/personal.php 33 additions, 2 deletions

settings/templates/personal.php

with 176 additions and 22 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