Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
Warn for password reset when files_encryption is enabled
No related branches found
No related tags found
Showing
- apps/files_encryption/hooks/hooks.php 13 additions, 0 deletionsapps/files_encryption/hooks/hooks.php
- apps/files_encryption/lib/helper.php 1 addition, 0 deletionsapps/files_encryption/lib/helper.php
- apps/files_encryption/lib/util.php 12 additions, 0 deletionsapps/files_encryption/lib/util.php
- core/application.php 50 additions, 14 deletionscore/application.php
- core/css/styles.css 6 additions, 0 deletionscore/css/styles.css
- core/js/lostpassword.js 10 additions, 13 deletionscore/js/lostpassword.js
- core/lostpassword/controller/lostcontroller.php 83 additions, 86 deletionscore/lostpassword/controller/lostcontroller.php
- core/lostpassword/css/resetpassword.css 4 additions, 0 deletionscore/lostpassword/css/resetpassword.css
- core/lostpassword/encrypteddataexception.php 0 additions, 14 deletionscore/lostpassword/encrypteddataexception.php
- core/lostpassword/templates/lostpassword.php 0 additions, 20 deletionscore/lostpassword/templates/lostpassword.php
- core/lostpassword/templates/resetpassword.php 10 additions, 2 deletionscore/lostpassword/templates/resetpassword.php
- tests/core/lostpassword/controller/lostcontrollertest.php 195 additions, 0 deletionstests/core/lostpassword/controller/lostcontrollertest.php
- tests/phpunit-autotest.xml 1 addition, 0 deletionstests/phpunit-autotest.xml
- tests/phpunit.xml.dist 2 additions, 0 deletionstests/phpunit.xml.dist
- tests/settings/controller/mailsettingscontrollertest.php 1 addition, 1 deletiontests/settings/controller/mailsettingscontrollertest.php
Loading
Please register or sign in to comment