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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz 2017-06-09 16:26:36 +02:00
commit 4bcad3e154
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
customize.dist/translations/messages.fr.js
View File

@ -283,6 +283,8 @@ define(function () {
out.fo_unableToRestore = "Impossible de restaurer ce fichier à son emplacement d'origine. Vous pouvez essayer de le déplacer à un nouvel emplacement."; out.fo_unableToRestore = "Impossible de restaurer ce fichier à son emplacement d'origine. Vous pouvez essayer de le déplacer à un nouvel emplacement.";
out.fo_unavailableName = "Un fichier ou dossier avec le même nom existe déjà au nouvel emplacement. Renommez cet élément avant d'essayer à nouveau."; out.fo_unavailableName = "Un fichier ou dossier avec le même nom existe déjà au nouvel emplacement. Renommez cet élément avant d'essayer à nouveau.";
out.fs_migration = "Votre CryptDrive est en train d'être mis à jour vers une nouvelle version. Cela implique que cette page doive être rechargée.<br><strong>Veuillez recharger la page pour pouvoir continuer à l'utiliser.</<strong>";
// login // login
out.login_login = "Connexion"; out.login_login = "Connexion";
out.login_makeAPad = 'Créer un pad anonymement'; out.login_makeAPad = 'Créer un pad anonymement';

2
customize.dist/translations/messages.js
View File

@ -285,6 +285,8 @@ define(function () {
out.fo_unableToRestore = "Unable to restore that file to its original location. You can try to move it to a new location."; out.fo_unableToRestore = "Unable to restore that file to its original location. You can try to move it to a new location.";
out.fo_unavailableName = "A file or a folder with the same name already exist at the new location. Rename the element and try again."; out.fo_unavailableName = "A file or a folder with the same name already exist at the new location. Rename the element and try again.";
out.fs_migration = "Your CryptDrive is being updated to a new version. As a result, the current page has to be reloaded.<br><strong>Please reload this page to continue to use it.</strong>";
// login // login
out.login_login = "Log in"; out.login_login = "Log in";
out.login_makeAPad = 'Create a pad anonymously'; out.login_makeAPad = 'Create a pad anonymously';

1
www/common/common-title.js
View File

@ -40,7 +40,6 @@ define(function () {
var renameCb = function (err, newTitle) { var renameCb = function (err, newTitle) {
if (err) { return; } if (err) { return; }
updateLocalTitle(newTitle); updateLocalTitle(newTitle);
console.log('here');
onLocal(); onLocal();
}; };

10
www/common/fsStore.js
View File

@ -292,8 +292,16 @@ define([
} }
return; return;
} }
})
.on('change', ['drive', 'migrate'], function () {
var path = arguments[2];
var value = arguments[1];
if (path[0] === 'drive' && path[1] === "migrate" && value === 1) {
rt.network.disconnect();
rt.realtime.abort();
Cryptpad.alert(Cryptpad.Messages.fs_migration, null, true);
}
}); });
}; };
Store.ready = function (f, Cryptpad) { Store.ready = function (f, Cryptpad) {

2
www/drive/main.js
View File

@ -1838,7 +1838,7 @@ define([
module.resetTree(); module.resetTree();
if (displayedCategories.indexOf(SEARCH) !== -1) { if (displayedCategories.indexOf(SEARCH) !== -1 && $tree.find('#searchInput').length) {
// in history mode we want to focus the version number input // in history mode we want to focus the version number input
if (!history.isHistoryMode && !APP.mobile()) { if (!history.isHistoryMode && !APP.mobile()) {
var st = $tree.scrollTop() || 0; var st = $tree.scrollTop() || 0;