Merge branch 'CollaboraOnline:master' into copy-button-clipboard

Signed-off-by: Parth Raiyani <[email protected]>
Change-Id: I3df4a8abbda83c456e953a36afb12a4bc2951296

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,43 +8,34 @@ assignees: ''
 ---
 
 ### Describe the Bug
-
 A clear and concise description of what the bug is.
 
 ### Steps to Reproduce
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
 4. See error
 
 ### Expected Behavior
-
 A clear and concise description of what you expected to happen.
 
 ### Actual Behavior
-
 A clear and concise description of what actually happens.
 
 ### Screenshots
-
 If applicable, add screenshots to help explain your problem.
 
 ### Desktop
-
 (Please complete the following information)
- - **OS:** [e.g. Windows 11]
- - **Browser:** [e.g. Chrome]
- - **Version:** [e.g. 114.0]
+ - **Collabora version:** [e.g. 23.05.5.3]
+ - **OS and version:** [e.g. Windows 11]
+ - **Browser and version:** [e.g. Chrome 114.0]
 
 ### Smartphone
-
 (Please complete the following information)
- - **Device:** [e.g. iPhone14]
- - **OS:** [e.g. iOS16.5]
- - **Browser:** [e.g. Safari]
- - **Version:** [e.g. 16.4]
+ - **Device:** [e.g. iPhone 14]
+ - **OS:** [e.g. iOS 16.5]
+ - **Browser and version:** [e.g. Safari 16.4]
 
 ### Additional Context
-
 Add any other context about the problem here.

.github/workflows/helm-release.yml

@@ -13,6 +13,7 @@ jobs:
     # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token
     permissions:
       contents: write
+      packages: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -30,10 +31,76 @@ jobs:
         with:
           version: v3.12.1
 
+      - name: Import GPG key
+        run: |
+          echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --dearmor --output keyring.gpg
+          echo "${{ secrets.GPG_PASSPHRASE }}" > passphrase-file.txt
+
       - name: Run chart-releaser
-        uses: helm/[email protected]
+        # for use with make-release-latest
+        uses: helm/[email protected]
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_SKIP_EXISTING: true
+          CR_KEY: Collabora Productivity
+          CR_KEYRING: keyring.gpg
+          CR_PASSPHRASE_FILE: passphrase-file.txt
+          CR_SIGN: true
         with:
           charts_dir: "kubernetes/helm"
-          config: kubernetes/helm/cr.yaml
+          config: kubernetes/helm/cr.yaml
+
+      # see https://github.com/helm/chart-releaser/issues/183
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push charts to GHCR
+        run: |
+          shopt -s nullglob
+          for pkg in .cr-release-packages/*; do
+            if [ -z "${pkg:-}" ]; then
+              break
+            fi
+
+            # Check if the package has a ".prov" extension and skip if true
+            # prov doesn't need to be pushed they are already pushed as layer in manifest
+            if [[ "${pkg}" == *.prov ]]; then
+              echo "Skipping package - ${pkg} with '.prov' extension"
+              continue
+            fi
+
+            # convert uppercase->lowercase to make sure it follows oci rules
+            lowercase=$(echo "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')
+            
+            echo "Pushing package - ${pkg} to ghcr.io repository - ${lowercase}"
+            helm push "${pkg}" "oci://ghcr.io/${lowercase}/charts"
+          done
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Push charts to Docker Hub
+        run: |
+          shopt -s nullglob
+          for pkg in .cr-release-packages/*; do
+            if [ -z "${pkg:-}" ]; then
+              break
+            fi
+
+            # Check if the package has a ".prov" extension and skip if true
+            # prov doesn't need to be pushed they are already pushed as layer in manifest
+            if [[ "${pkg}" == *.prov ]]; then
+              echo "Skipping package - ${pkg} with '.prov' extension"
+              continue
+            fi
+
+            echo "Pushing package - ${pkg} to docker.io repository - collabora"
+            helm push "${pkg}" "oci://registry-1.docker.io/collabora"
+          done

.gitignore

@@ -14,7 +14,6 @@
 **/.cache
 Makefile
 Makefile.in
-coolkitconfig.xcu
 coolwsd.spec
 coolwsd.xml
 aclocal.m4
@@ -99,6 +98,8 @@ coolforkit-nocaps
 loadtest
 unittest
 clientnb
+libsimd.a
+coolwsd-inproc
 
 # Fuzzer
 *_fuzzer
@@ -121,6 +122,7 @@ ios/Mobile/Info.plist
 ios/Mobile/Fonts
 ios/Mobile/Branding
 ios/Mobile/Resources/Settings.bundle/Root.plist
+ios/Mobile/coolkitconfig.xcu
 
 # symlinks created by configure for the iOS app Xcode project
 lobuilddir-symlink

.gitpod-files/coolwsd-gitpod.xml

@@ -1,5 +1,8 @@
 <config>
 
+    <!-- For more detailed documentation on typical configuration options please see:
+         https://sdk.collaboraonline.com/docs/installation/Configuration.html -->
+
     <!-- Note: 'default' attributes are used to document a setting's default value as well as to use as fallback. -->
     <!-- Note: When adding a new entry, a default must be set in WSD in case the entry is missing upon deployment. -->
 
@@ -44,6 +47,7 @@
     </per_document>
 
     <per_view desc="View-specific settings.">
+        <group_download_as desc="If set to true, groups download as icons into a dropdown for the notebookbar view." type="bool" default="true">true</group_download_as>
         <out_of_focus_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the browser tab is no longer in focus. Defaults to 120 seconds." type="uint" default="120">120</out_of_focus_timeout_secs>
         <idle_timeout_secs desc="The maximum number of seconds before dimming and stopping updates when the user is no longer active (even if the browser is in focus). Defaults to 15 minutes." type="uint" default="900">900</idle_timeout_secs>
     </per_view>
@@ -134,7 +138,8 @@
     </welcome>
 
     <user_interface>
-      <mode type="string" desc="Controls the user interface style (classic|notebookbar)" default="classic">classic</mode>
+      <mode type="string" desc="Controls the user interface style. The 'default' means: Take the value from ui_defaults, or decide for one of compact or tabbed (default|compact|tabbed)" default="default">default</mode>
+      <use_integration_theme desc="Use theme from the integrator" type="bool" default="true">true</use_integration_theme>
     </user_interface>
 
     <storage desc="Backend storage">
@@ -168,8 +173,6 @@
         </ssl>
     </storage>
 
-    <tile_cache_persistent desc="Should the tiles persist between two editing sessions of the given document?" type="bool" default="true">true</tile_cache_persistent>
-
     <admin_console desc="Web admin console settings.">
         <enable desc="Enable the admin console functionality" type="bool" default="true">true</enable>
         <enable_pam desc="Enable admin user authentication with PAM" type="bool" default="false">false</enable_pam>
@@ -180,4 +183,16 @@
     <monitors desc="Addresses of servers we connect to on start for monitoring">
     </monitors>
 
+    <fonts_missing>
+        <handling desc="How to handle fonts mising in a document: 'report', 'log', 'both', or 'ignore'" type="string" default="log">both</handling>
+    </fonts_missing>
+
+    <zotero desc="Zotero plugin configuration. For more details about Zotero visit https://www.zotero.org/">
+        <enable desc="Enable Zotero plugin." type="bool" default="true">true</enable>
+    </zotero>
+
+   <overwrite_mode>
+        <enable desc="Enable overwrite mode (user can use insert key)" type="bool" default="true">true</enable>
+    </overwrite_mode>
+
 </config>