Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

db06b906

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

Downloads
- Plain Diff

Merge pull request #3610 from owncloud/encryption_recovery_for_ldap

recover encryption keys if ownCloud can't change the log-in password

parents b237d037 d7a9852f

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/hooks/hooks.php 9 additions, 0 deletions

apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/helper.php 1 addition, 0 deletions

apps/files_encryption/lib/helper.php
lib/user/user.php 3 additions, 3 deletions

lib/user/user.php
settings/ajax/changepassword.php 21 additions, 9 deletions

settings/ajax/changepassword.php
settings/templates/users.php 5 additions, 1 deletion

settings/templates/users.php

with 39 additions and 13 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