Merge branch 'soon' into staging

pull/1/head
ansuz 4 years ago
commit 5011f260fb

@ -333,7 +333,6 @@ button:not(.btn).primary:hover{
if (data.type === "offline") { if (data.type === "offline") {
try { try {
isOffline = true; isOffline = true;
Messages.offlineError = "OFFLINE MODE NOT AVAILABLE"; // XXX
document.querySelector('#cp-loading-message').setAttribute('style', 'display:block;'); document.querySelector('#cp-loading-message').setAttribute('style', 'display:block;');
document.querySelector('#cp-loading-message').innerText = Messages.offlineError; document.querySelector('#cp-loading-message').innerText = Messages.offlineError;
} catch (e) { console.error(e); } } catch (e) { console.error(e); }

@ -4368,7 +4368,7 @@ define([
if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder
// disconnected // disconnected
if (!APP.editable) { if (!APP.editable) {
return void UI.warn(Messages.error); // XXX return void UI.warn(Messages.error);
} }
// if folder is inside SF // if folder is inside SF
else if (manager.isInSharedFolder(paths[0].path)) { else if (manager.isInSharedFolder(paths[0].path)) {

@ -1506,5 +1506,6 @@
"admin_support_closed": "Tickets fermé :", "admin_support_closed": "Tickets fermé :",
"admin_support_answered": "Tickets traité :", "admin_support_answered": "Tickets traité :",
"admin_support_normal": "Tickets sans réponse :", "admin_support_normal": "Tickets sans réponse :",
"admin_support_premium": "Tickets prime :" "admin_support_premium": "Tickets prime :",
"offlineError": "MODE HORS LIGNE NON DISPONIBLE"
} }

@ -1506,5 +1506,6 @@
"admin_support_first": "Created on: ", "admin_support_first": "Created on: ",
"admin_support_last": "Updated on: ", "admin_support_last": "Updated on: ",
"access_offline": "You are currently offline. Access management is not available.", "access_offline": "You are currently offline. Access management is not available.",
"share_noContactsOffline": "You are currently offline. Contacts are not available." "share_noContactsOffline": "You are currently offline. Contacts are not available.",
"offlineError": "OFFLINE MODE NOT AVAILABLE"
} }

Loading…
Cancel
Save