From 03e8d161ab6338818a7ed0bf976d6b93bf0b481b Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 9 Jun 2020 10:40:47 +0200 Subject: [PATCH 1/3] Redirect to the team invitation link on login/register --- www/teams/main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/teams/main.js b/www/teams/main.js index 6c780a8fd..65292b1f6 100644 --- a/www/teams/main.js +++ b/www/teams/main.js @@ -104,6 +104,8 @@ define([ }; SFCommonO.start({ getSecrets: getSecrets, + hash: hash, + href: href, noHash: true, noRealtime: true, //driveEvents: true, From bd5a8ba3fb8b8bbcf16f73231db3701a3973da81 Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 9 Jun 2020 11:05:37 +0200 Subject: [PATCH 2/3] Remove the (not working) option to rename a pad in an anonymous drive --- www/common/drive-ui.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 8c8d7f5f1..f12bf665b 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -1315,6 +1315,7 @@ define([ if (!APP.loggedIn) { hide.push('openparent'); + hide.push('rename'); } filter = function ($el, className) { From 88edea95c8ad53cbb6378d5b782e3441d201b0ee Mon Sep 17 00:00:00 2001 From: yflory Date: Tue, 9 Jun 2020 13:24:18 +0200 Subject: [PATCH 3/3] Fix type error in ooslide --- www/common/onlyoffice/inner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 19adc46b2..6218681c2 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -271,7 +271,7 @@ define([ var checkDrawings = function () { var editor = getEditor(); - if (!editor) { return false; } + if (!editor || !editor.GetSheets) { return false; } var s = editor.GetSheets(); return s.some(function (obj) { return obj.worksheet.Drawings.length; @@ -775,6 +775,7 @@ define([ } // Send the changes + content.locks = content.locks || {}; rtChannel.sendMsg({ type: "saveChanges", changes: parseChanges(obj.changes),