Merge pull request 'Release/9.4.0' from develop into master

.eslintrc.js

@@ -0,0 +1,5 @@
+module.exports = {
+	extends: [
+		'@nextcloud',
+	],
+}

.github/workflows/artifact.yml

@@ -36,7 +36,7 @@ jobs:
           rm -rf ./node_modules/
           rm -rf ./src/
           rm ./package.json
-          rm ./package-lock.json
+          rm ./npm-shrinkwrap.json
           rm ./webpack.js
           rm -rf ./assets/document-templates/.git
           rm -rf ./assets/document-formats/.git

.github/workflows/lint-eslint.yml

@@ -0,0 +1,36 @@
+name: ESLint
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [master, develop]
+  pull_request:
+    branches: [master, develop]
+
+env:
+  NODE_VERSION: 20
+
+jobs:
+  lint:
+    name: Lint 
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./src
+    steps:
+      - name: Install NodeJS
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Code Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Code Linting
+        run: npx eslint *.js
+
+      - name: CSS Linting
+        run: npx stylelint ../css/*.css

.github/workflows/lint-php.yml

@@ -1,6 +1,7 @@
-name: Lint
+name: Lint-php
 
 on:
+  workflow_dispatch:
   push:
     branches: [master, develop]
   pull_request:

.github/workflows/lint-phpcs.yml

@@ -1,11 +1,11 @@
-name: Lint
+name: Lint-phpcs
 
 on:
   workflow_dispatch:
   push:
     branches: [master, develop]
   pull_request:
-    branches: [master, develop, feature/nc-27]
+    branches: [master, develop]
 
 permissions:
   contents: read

.stylelintrc.json

@@ -0,0 +1 @@
+{ "extends": ["@nextcloud/stylelint-config"] }

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 9.4.0
+## Added
+- support tiff format for inserting
+
+## Changed
+- compatible with Nextcloud 30
+- Nextcloud v27 is no longer supported
+- using user's timezone for watermark
+
 ## 9.3.0
 ## Changed
 - creating and editing pdf form

appinfo/info.xml

@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>agpl</licence>
     <author mail="[email protected]" homepage="https://www.onlyoffice.com/">Ascensio System SIA</author>
-    <version>9.3.0</version>
+    <version>9.4.0</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <prevent_group_restriction/>
@@ -30,7 +30,7 @@
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open_form.png</screenshot>
     <dependencies>
-        <nextcloud min-version="27" max-version="29"/>
+        <nextcloud min-version="28" max-version="30"/>
     </dependencies>
     <settings>
         <admin>OCA\Onlyoffice\AdminSettings</admin>

css/editor.css

@@ -55,11 +55,13 @@
 .AscDesktopEditor #body-user #header {
     display: none;
 }
+
 .AscDesktopEditor #body-user #content {
     min-height: 100%;
     padding-top: 0;
     margin-top: 0px;
 }
+
 .AscDesktopEditor #app > iframe {
     height: 100% !important;
 }

css/format.css

@@ -16,21 +16,32 @@
  *
  */
 
-.icon-onlyoffice-new-docx {
-    background-size: 20px !important;
-    background-position: 12px !important;
-    background-image: url("../img/new-docx.svg");
-}
-.icon-onlyoffice-new-xlsx {
-    background-size: 20px !important;
-    background-position: 12px !important;
-    background-image: url("../img/new-xlsx.svg");
+.icon-onlyoffice-new-docx:after,
+.icon-onlyoffice-new-xlsx:after,
+.icon-onlyoffice-new-pptx:after {
+    display: block;
+    margin-top: 5px;
 }
+
+.icon-onlyoffice-new-docx,
+.icon-onlyoffice-new-xlsx,
 .icon-onlyoffice-new-pptx {
-    background-size: 20px !important;
-    background-position: 12px !important;
-    background-image: url("../img/new-pptx.svg");
+    display: flex;
+    justify-content: center;
 }
+
+.icon-onlyoffice-new-docx:after {
+    content: url("../img/new-docx.svg");
+}
+
+.icon-onlyoffice-new-xlsx:after {
+    content: url("../img/new-xlsx.svg");
+}
+
+.icon-onlyoffice-new-pptx:after {
+    content: url("../img/new-pptx.svg");
+}
+
 .icon-onlyoffice-new-pdf {
     background-size: 20px !important;
     background-position: 12px !important;

css/main.css

@@ -49,9 +49,11 @@
 #body-user.onlyoffice-inline .files-list__header {
     display: none;
 }
+
 #body-user.onlyoffice-inline #app-navigation-toggle {
     display: none !important;
 }
+
 #body-public.onlyoffice-inline #content #app-content,
 #body-user.onlyoffice-inline #content #app-content,
 #body-user.onlyoffice-inline #content #app-content-vue,
@@ -61,6 +63,7 @@
     overflow: hidden;
     overscroll-behavior-y: none;
 }
+
 #body-public.onlyoffice-inline footer {
     display: none !important;
 }
@@ -84,32 +87,40 @@
 .AscDesktopEditor #body-user #header {
     display: none;
 }
+
 .AscDesktopEditor #body-user #content {
     padding-top: 0;
     margin-top: 0px;
     height: 100%;
 }
+
 .AscDesktopEditor #body-user #app-navigation,
 .AscDesktopEditor #body-user #controls,
 .AscDesktopEditor #body-user #app-sidebar {
     top: 0;
 }
+
 .AscDesktopEditor #body-user #app-navigation {
     height: 100%;
 }
+
 .AscDesktopEditor #body-user #app-sidebar {
     height: 100vh;
 }
+
 .AscDesktopEditor #body-user table.multiselect thead,
 .AscDesktopEditor #app-content-files thead {
     top: 44px;
 }
+
 .AscDesktopEditor #body-user #gallery-button {
     display: none;
 }
+
 .onlyoffice-download-container {
     display: flex;
 }
+
 .onlyoffice-download-container p {
     margin-right: 10px;
     padding-top: 10px;

css/settings.css

@@ -30,31 +30,39 @@
     box-sizing: content-box;
     padding-top: 6px;
 }
+
 .onlyoffice-header {
     display: inline-block;
     margin-top: 16px;
 }
+
 .section-onlyoffice input {
     display: block;
     width: 250px;
 }
+
 .onlyoffice-hide {
     display: none;
 }
+
 #onlyofficeAdv {
     cursor: pointer;
     text-decoration: none;
 }
+
 #onlyofficeAdv .icon {
     display: inline-block;
     margin-bottom: -3px;
 }
+
 #onlyofficeAddrSave {
     float: left;
 }
+
 .onlyoffice-demo {
     margin-left: 90px;
 }
+
 #s2id_onlyofficeLimitGroups,
 #s2id_onlyofficeWatermark_allGroupsList,
 #s2id_onlyofficeWatermark_allTagsList,
@@ -64,18 +72,21 @@
     margin-top: 6px;
     width: 250px;
 }
+
 .onlyoffice-exts {
     column-width: 100px;
     -moz-column-width: 100px;
     -webkit-column-width: 100px;
 }
+
 .onlyoffice-tables {
     margin-top: 4px;
     line-height: initial;
     column-width: 140px;
     -moz-column-width: 140px;
     -webkit-column-width: 140px;
 }
+
 #onlyofficeSecret-show {
     left: 205px;
 }

css/share.css

@@ -33,33 +33,41 @@
     -webkit-mask: url("../img/app-dark.svg") no-repeat 50% 50%;
     -webkit-mask-size: 16px 16px;
 }
+
 .onlyoffice-share-item {
     display: flex;
     list-style-type: none;
 }
+
 .onlyoffice-share-item img {
     width: 32px;
     height: 32px;
 }
+
 .onlyoffice-share-popup {
     margin-right: 14px;
     margin-top: 44px;
 }
+
 .onlyoffice-share-item span {
     margin-left: 10px;
     margin-top: 5px;
 }
+
 #onlyoffice-share-menu {
     margin-left: auto;
 }
+
 .onlyoffice-share-action {
     line-height: 44px;
 }
+
 .onlyoffice-share-label {
     padding-right: 14px !important;
     padding-left: 14px !important;
     opacity: .7;
 }
+
 .onlyoffice-share-link-avatar {
     height: 32px;
     width: 32px;
@@ -68,6 +76,7 @@
     display: flex;
     justify-content: center;
 }
+
 .onlyoffice-share-link-avatar img {
     height: 16px;
     width: 16px;