web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Own drive migration

Browse Source
This commit is contained in:
yflory
2018-12-19 18:59:20 +01:00
parent bbc06f668f
commit f2f9b57505
4 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/outer/async-store.js
View File

@@ -456,7 +456,8 @@ define([
edPublic: store.proxy.edPublic,
friends: store.proxy.friends || {},
settings: store.proxy.settings,
thumbnails: disableThumbnails === false
thumbnails: disableThumbnails === false,
isDriveOwned: Boolean(Util.find(store, ['driveMetadata', 'owners']))
}
};
cb(JSON.parse(JSON.stringify(metadata)));
@@ -1523,8 +1524,9 @@ define([
if (!data.userHash) {
returned.anonHash = Hash.getEditHashFromKeys(secret);
}
}).on('ready', function () {
}).on('ready', function (info) {
if (store.userObject) { return; } // the store is already ready, it is a reconnection
store.driveMetadata = info.metadata;
if (!rt.proxy.drive || typeof(rt.proxy.drive) !== 'object') { rt.proxy.drive = {}; }
var drive = rt.proxy.drive;
// Creating a new anon drive: import anon pads from localStorage

1
www/common/translations/messages.js
View File

@@ -667,6 +667,7 @@ define(function () {
out.settings_ownDriveHint = "Migrating your drive to the new version will give you access to new features..."; // XXX
out.settings_ownDriveButton = "Migrate"; // XXX
out.settings_ownDriveConfirm = "Are you sure?"; // XXX
out.settings_ownDrivePending = "Your account is being migrated. Please do not close or reload this page until the process has completed."; // XXX
out.settings_changePasswordTitle = "Change your password";
out.settings_changePasswordHint = "Change your account's password. Enter your current password, and confirm the new password by typing it twice.<br>" +