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

54b24ca8

Commit 54b24ca8 authored 11 years ago by Morris Jobke

Downloads
- Plain Diff

Merge pull request #6048 from owncloud/encryption_initial_enc_indicator

show a message at the log-in screen if inital encryption take place

parents 52959931 55d7cf8f

Branches

No related tags found

Loading

Changes 6

Show whitespace changes

Inline Side-by-side

Showing

apps/files_encryption/ajax/getMigrationStatus.php 27 additions, 0 deletions

apps/files_encryption/ajax/getMigrationStatus.php
apps/files_encryption/appinfo/app.php 2 additions, 1 deletion

apps/files_encryption/appinfo/app.php
apps/files_encryption/js/detect-migration.js 29 additions, 0 deletions

apps/files_encryption/js/detect-migration.js
apps/files_encryption/lib/util.php 17 additions, 15 deletions

apps/files_encryption/lib/util.php
core/css/styles.css 9 additions, 0 deletions

core/css/styles.css
core/templates/login.php 5 additions, 1 deletion

core/templates/login.php

with 89 additions and 17 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