diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index e6c515f60e..a6a1a319ba 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -923,6 +923,10 @@ isSafari_mobile = !isIE && !isChrome && check(/safari/) && (navigator.maxTouchPoints>0), path_type; + //XXX CryptPad do not use mobile page for iOS Safari. The mobile page does not load require.js. + // We need require() in docscoapi.js + isSafari_mobile = false; + path += app + "/"; // XXX Cryptpad: Only main here? path_type = (config.type === "mobile" || isSafari_mobile) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index c953aff734..af3d3f3c1e 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -547,6 +547,9 @@ define([ if (data.doc) { appHeader.setDocumentCaption(data.doc.title); } + + // XXX CryptPad: disable protect feature + this.permissions.protect = false; }, onProcessSaveResult: function(data) { diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index f60b0ae735..b6bb82b1d7 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -521,4 +521,4 @@ define([ Common.NotificationCenter.trigger('edit:complete', this.rightmenu); } }); -}); \ No newline at end of file +}); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 0617d71392..186c1698fd 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -3303,6 +3303,6 @@ "DE.Views.WatermarkSettingsDialog.textTitle": "Watermark settings", "DE.Views.WatermarkSettingsDialog.textTransparency": "Semitransparent", "DE.Views.WatermarkSettingsDialog.textUnderline": "Underline", - "DE.Views.WatermarkSettingsDialog.tipFontName": "Font name", - "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font size" -} \ No newline at end of file + "DE.Views.WatermarkSettingsDialog.tipFontName": "Font Name", + "DE.Views.WatermarkSettingsDialog.tipFontSize": "Font Size" +} diff --git a/apps/documenteditor/main/locale/pl.json b/apps/documenteditor/main/locale/pl.json index 3539926f71..428530a046 100644 --- a/apps/documenteditor/main/locale/pl.json +++ b/apps/documenteditor/main/locale/pl.json @@ -2871,4 +2871,4 @@ "DE.Views.WatermarkSettingsDialog.textUnderline": "Podkreślenie", "DE.Views.WatermarkSettingsDialog.tipFontName": "Nazwa czcionki", "DE.Views.WatermarkSettingsDialog.tipFontSize": "Rozmiar czcionki" -} \ No newline at end of file +} diff --git a/apps/presentationeditor/main/app/view/DocumentHolder.js b/apps/presentationeditor/main/app/view/DocumentHolder.js index 896f8a7ff8..c013999c92 100644 --- a/apps/presentationeditor/main/app/view/DocumentHolder.js +++ b/apps/presentationeditor/main/app/view/DocumentHolder.js @@ -1739,6 +1739,7 @@ define([ value: 0 }), new Common.UI.MenuItem({ + cls : 'cp-from-url', caption : this.textFromUrl, value: 1 }), diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 8015b3a454..ddd9427051 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -554,6 +554,9 @@ define([ this.api.asc_registerCallback('asc_onRunAutostartMacroses', _.bind(this.onRunAutostartMacroses, this)); this.api.asc_setDocInfo(docInfo); this.api.asc_getEditorPermissions(this.editorConfig.licenseUrl, this.editorConfig.customerId); + + // XXX CryptPad: disable protect feature + this.permissions.protect = false; }, onProcessSaveResult: function(data) { diff --git a/apps/spreadsheeteditor/mobile/locale/fr.json b/apps/spreadsheeteditor/mobile/locale/fr.json index cdb37dc98e..959e336ece 100644 --- a/apps/spreadsheeteditor/mobile/locale/fr.json +++ b/apps/spreadsheeteditor/mobile/locale/fr.json @@ -714,4 +714,4 @@ "warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.
Êtes-vous sûr de vouloir continuer?" } } -} \ No newline at end of file +}