[Pkg-owncloud-commits] [owncloud] 223/239: Merge pull request #6048 from owncloud/encryption_initial_enc_indicator

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 54b24ca88d34bfdafaeecb12c9c8ba85e21de8f7
Merge: 5295993 55d7cf8
Author: Morris Jobke <morris.jobke at gmail.com>
Date:   Wed Nov 27 14:10:11 2013 -0800

    Merge pull request #6048 from owncloud/encryption_initial_enc_indicator
    
    show a message at the log-in screen if inital encryption take place

 apps/files_encryption/ajax/getMigrationStatus.php | 27 +++++++++++++++++++
 apps/files_encryption/appinfo/app.php             |  3 ++-
 apps/files_encryption/js/detect-migration.js      | 29 ++++++++++++++++++++
 apps/files_encryption/lib/util.php                | 32 ++++++++++++-----------
 core/css/styles.css                               |  9 +++++++
 core/templates/login.php                          |  6 ++++-
 6 files changed, 89 insertions(+), 17 deletions(-)

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