[Pkg-owncloud-commits] [owncloud] 22/165: Merge pull request #15675 from owncloud/enc_error_messages

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit ac133e9faa0a3568716596e83c5ff0993c8dcf89
Merge: 1174ad0 e93f262
Author: Clark Tomlinson <fallen013 at gmail.com>
Date:   Thu Apr 16 09:45:09 2015 -0400

    Merge pull request #15675 from owncloud/enc_error_messages
    
    [encryption] display warning if password changed or if the keys are not initialized

 apps/encryption/appinfo/app.php                 |  2 +
 apps/encryption/appinfo/application.php         | 22 +++++-
 apps/encryption/appinfo/routes.php              |  7 +-
 apps/encryption/controller/statuscontroller.php | 89 +++++++++++++++++++++++++
 apps/encryption/js/encryption.js                | 33 +++++++--
 apps/encryption/lib/keymanager.php              | 12 +++-
 6 files changed, 155 insertions(+), 10 deletions(-)

diff --cc apps/encryption/appinfo/app.php
index 0e8ce56,cbc50e6..0c7c231
--- a/apps/encryption/appinfo/app.php
+++ b/apps/encryption/appinfo/app.php
@@@ -23,9 -23,9 +23,11 @@@
  
  namespace OCA\Encryption\AppInfo;
  
+ \OCP\Util::addscript('encryption', 'encryption');
+ 
  $app = new Application();
 -$app->registerEncryptionModule();
 -$app->registerHooks();
 -$app->registerSettings();
 +if (\OC::$server->getEncryptionManager()->isReady()) {
 +	$app->registerEncryptionModule();
 +	$app->registerHooks();
 +	$app->registerSettings();
 +}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git