Merge branch 'cp7.2.2.69' into cp7.3.2

cryptpad · Sep 6, 2023 · 64cbfe0 · 64cbfe0
2 parents 21eb575 + 4fa83c5
commit 64cbfe0
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git 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
@@ -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
@@ -521,4 +521,4 @@ define([
             Common.NotificationCenter.trigger('edit:complete', this.rightmenu);
         }
     });
-});
+});
diff --git 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"
-}
+  "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
@@ -2871,4 +2871,4 @@
   "DE.Views.WatermarkSettingsDialog.textUnderline": "Podkreślenie",
   "DE.Views.WatermarkSettingsDialog.tipFontName": "Nazwa czcionki",
   "DE.Views.WatermarkSettingsDialog.tipFontSize": "Rozmiar czcionki"
-}
+}
diff --git 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
@@ -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
@@ -714,4 +714,4 @@
       "warnDownloadAs": "Si vous continuez à enregistrer dans ce format toutes les fonctions sauf le texte seront perdues.<br>Êtes-vous sûr de vouloir continuer?"
     }
   }
-}
+}