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

a057108c

Commit a057108c authored 10 years ago by Björn Schießle Committed by Thomas Müller 10 years ago

Downloads
- Patches
- Plain Diff

make recovery key work

parent 51302d58

Loading

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

apps/encryption/appinfo/application.php 1 addition, 0 deletions

apps/encryption/appinfo/application.php
apps/encryption/controller/recoverycontroller.php 3 additions, 0 deletions

apps/encryption/controller/recoverycontroller.php
apps/encryption/hooks/userhooks.php 17 additions, 6 deletions

apps/encryption/hooks/userhooks.php
apps/encryption/lib/keymanager.php 13 additions, 1 deletion

apps/encryption/lib/keymanager.php
apps/encryption/lib/recovery.php 48 additions, 47 deletions

apps/encryption/lib/recovery.php
settings/changepassword/controller.php 32 additions, 5 deletions

settings/changepassword/controller.php
settings/users.php 2 additions, 2 deletions

settings/users.php

with 116 additions and 61 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