Use image handling of OO fork

Let onlyoffice-editor handle auth
Readd OnlyOffice v1
2024-07-10 15:44:39 +02:00 · 2024-07-09 15:16:19 +02:00 · 2024-07-05 16:43:09 +02:00 · 2024-07-05 16:37:30 +02:00 · 2024-07-01 10:22:23 +02:00 · 2024-07-01 09:46:10 +02:00
4 changed files with 571 additions and 582 deletions
--- a/install-onlyoffice.sh
+++ b/install-onlyoffice.sh
@ -33,7 +33,7 @@ main() {
    install_version v4 6ebc6938
    install_version v5 88a356f0
    install_version v6 abd8a309
-    install_version v7 ba82142f
+    install_version v7 2792e6e1
    install_x2t v7.3+1 ab0c05b0e4c81071acea83f0c6a8e75f5870c360ec4abc4af09105dd9b52264af9711ec0b7020e87095193ac9b6e20305e446f2321a541f743626a598e5318c1

    rm -rf "$BUILDS_DIR"
--- a/package-lock.json
+++ b/package-lock.json
@ -44,6 +44,7 @@
        "netflux-websocket": "^1.2.0",
        "notp": "^2.0.3",
        "nthen": "0.1.8",
+        "onlyoffice-editor": "file:../onlyoffice-editor",
        "open-sans-fontface": "^1.4.0",
        "openid-client": "^5.4.2",
        "pako": "^2.1.0",
@ -74,6 +75,28 @@
        "url": "https://opencollective.com/cryptpad"
      }
    },
+    "../onlyoffice-api": {
+      "version": "0.0.1",
+      "extraneous": true,
+      "license": "AGPL-3.0-or-later",
+      "devDependencies": {
+        "parcel": "^2.12.0"
+      }
+    },
+    "../onlyoffice-editor": {
+      "version": "0.0.1",
+      "license": "AGPL-3.0-or-later",
+      "devDependencies": {
+        "@eslint/js": "^9.0.0",
+        "eslint": "^8.57.0",
+        "prettier": "3.2.5",
+        "ts-loader": "^9.5.1",
+        "typescript": "^5.4.5",
+        "typescript-eslint": "^7.7.0",
+        "webpack": "^5.91.0",
+        "webpack-cli": "^5.1.4"
+      }
+    },
    "node_modules/@aashutoshrathi/word-wrap": {
      "version": "1.2.6",
      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
@ -3654,6 +3677,10 @@
        "wrappy": "1"
      }
    },
+    "node_modules/onlyoffice-editor": {
+      "resolved": "../onlyoffice-editor",
+      "link": true
+    },
    "node_modules/open-sans-fontface": {
      "version": "1.4.0",
      "resolved": "https://registry.npmjs.org/open-sans-fontface/-/open-sans-fontface-1.4.0.tgz",
--- a/www/common/onlyoffice/current-version.js
+++ b/www/common/onlyoffice/current-version.js
@ -2,6 +2,10 @@
 //
 // SPDX-License-Identifier: AGPL-3.0-or-later

-define({
-    currentVersion: 'v7'
+define(() => {
+    const version = 7;
+    return {
+        currentVersionNumber: version,
+        currentVersion: 'v' + version
+    };
 });
--- a/www/common/onlyoffice/inner.js
+++ b/www/common/onlyoffice/inner.js
Author	SHA1	Message	Date
Wolfgang Ginolas	9f69feb244	Use image handling of OO fork	2024-07-10 15:44:39 +02:00
Wolfgang Ginolas	0ccac55a49	Let onlyoffice-editor handle auth	2024-07-09 15:16:19 +02:00
Wolfgang Ginolas	6ee8ff5e57	Readd OnlyOffice v1	2024-07-05 16:43:09 +02:00
Wolfgang Ginolas	2f8cb0dac6	Merge remote-tracking branch 'origin/staging' into insert-onlyoffice-api	2024-07-05 16:37:30 +02:00
Wolfgang Ginolas	86851f4f30	Merge remote-tracking branch 'origin/staging' into insert-onlyoffice-api	2024-07-01 10:22:23 +02:00
Wolfgang Ginolas	5cfbecc119	Manual cherry-pick: API: support downloadAs command	2024-07-01 09:46:10 +02:00
Wolfgang Ginolas	e3613ed97e	Manual cherry-pick: Support OO apps in the API	2024-07-01 09:41:43 +02:00
Wolfgang Ginolas	0573b76bb1	Fix install-onlyoffice.sh	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	9b2fc90476	Load OO from window again	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	0309a2462e	Update to version 7	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	944eaf2a53	Rename onlyoffice-api to onlyoffice-editor	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	d855d0b884	Fix usage of legacy channel and some cleanups	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	798fff51ba	Use installLegacyChannel	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	fbaf81090c	Use OnlyOffice v7	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	4f1f7f6d6d	Use channels for old OnlyOffice versions	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	716ce828ff	Use one constant for the OnlyOffice version	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	d1f5a25cdd	Replace OO channel with OOApi	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	d172b420e7	Communicate via OOApi	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	6df12cd813	Script is loaded by OOApi now	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	a90470c8d9	Pass (dummy) URL to OnlyOfficeEditor	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	bf89d0a601	Replace oo-api with external dependecy	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	6d6c026e0d	A working version before moving oo-api to another repo	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	ecc3950387	WIP insert queue	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	b4a45f0351	WIP add some logging	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	7040ccd184	WIP2	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	ff1173ac9e	WIP	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	d66420496e	Split onlyoffice/inner in smaller functions	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	90d27e68a9	[wip] started with API proof of concept	2024-06-27 14:53:35 +02:00
yflory	792d27c896	Fix CodeMirror focus issue	2024-06-27 14:53:35 +02:00
yflory	5f269fcff8	lint compliance	2024-06-27 14:53:35 +02:00
mathilde-cryptpad	e6ab5a90ac	explain with easier words the purpose of httpSafePort	2024-06-27 14:53:35 +02:00
daria	ef0c8cd39f	change shortcut for getting out of text editors Code/Slides	2024-06-27 14:53:35 +02:00
daria	97ccc16925	add shortcut for getting out of Code editor	2024-06-27 14:53:35 +02:00
daria	ec59395bca	add outline to focused elements on Code/Markdown tools	2024-06-27 14:53:35 +02:00
Fabrice Mouhartem	ceeebd679a	Remove redraw in notification dropdown - Created square angles on the right side of the notification dropdown when hovering above the dismiss (❌) button - Fix #1465	2024-06-27 14:53:35 +02:00
Fabrice Mouhartem	46f8c04b3c	maintenance: another typo in the comments…	2024-06-27 14:53:35 +02:00
Fabrice Mouhartem	5a4d78a56c	maintenance: fix typo in comments (minor)	2024-06-27 14:53:35 +02:00
Fabrice Mouhartem	83b52a221f	#1089 : Contextual menu `open` on anonymous drive - Related to https://github.com/cryptpad/cryptpad/issues/1089#issuecomment-2044954222	2024-06-27 14:53:35 +02:00
mathilde-cryptpad	c971cf1527	clarify how to use the different ports, see #1212	2024-06-27 14:53:35 +02:00
mathilde-cryptpad	41fd888a39	update Nginx examples with the new http2 option	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	4d748bd908	Remove duplicate args_isString	2024-06-27 14:53:35 +02:00
Wolfgang Ginolas	d58497ae8e	Tighten eslint rules	2024-06-27 14:53:35 +02:00