Merge branch 'develop' into dependabot/npm_and_yarn/postcss-8.4.31

.github/workflows/build.yml

@@ -2,16 +2,33 @@ name: Build
 on:
     pull_request: {}
     push:
-        branches: [master]
+        branches: [develop, master]
 # develop pushes and repository_dispatch handled in build_develop.yaml
 env:
     # These must be set for fetchdep.sh to get the right branch
     REPOSITORY: ${{ github.repository }}
     PR_NUMBER: ${{ github.event.pull_request.number }}
 jobs:
     build:
-        name: "Build"
-        runs-on: ubuntu-latest
+        name: "Build on ${{ matrix.image }}"
+        # We build on all 3 platforms to ensure we don't have any OS-specific build incompatibilities
+        strategy:
+            fail-fast: false
+            matrix:
+                image:
+                    - ubuntu-latest
+                    - windows-latest
+                    - macos-latest
+                isDevelop:
+                    - ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
+                # Skip the ubuntu-latest build for the develop branch as the dedicated CD build_develop workflow handles that
+                exclude:
+                    - isDevelop: true
+                      image: ubuntu-latest
+        runs-on: ${{ matrix.image }}
+        defaults:
+            run:
+                shell: bash
         steps:
             - uses: actions/checkout@v4
 

.github/workflows/docs.yml

@@ -0,0 +1,52 @@
+name: Deploy documentation
+
+on:
+    push:
+        branches: [develop]
+    workflow_dispatch: {}
+
+jobs:
+    docs:
+        name: GitHub Pages
+        runs-on: ubuntu-latest
+        steps:
+            - name: Fetch element-desktop
+              uses: actions/checkout@v4
+              with:
+                  repository: vector-im/element-desktop
+                  path: element-desktop
+
+            - name: Fetch element-web
+              uses: actions/checkout@v4
+              with:
+                  path: element-web
+
+            - name: Fetch matrix-react-sdk
+              uses: actions/checkout@v4
+              with:
+                  repository: matrix-org/matrix-react-sdk
+                  path: matrix-react-sdk
+
+            - name: Setup mdBook
+              uses: peaceiris/actions-mdbook@v1
+              with:
+                  mdbook-version: "0.4.10"
+
+            - name: Install mdbook-combiner
+              run: cargo install mdbook-combiner
+
+            - name: Build docs
+              run: |
+                  mkdir docs
+                  mv element-desktop/docs docs/element-desktop
+                  mv element-web/docs docs/element-web
+                  mv matrix-react-sdk/docs docs/matrix-react-sdk
+                  mdbook-combiner -m docs
+                  cp element-web/book.toml .
+                  mdbook build
+
+            - name: Deploy to gh pages
+              uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
+              with:
+                  github_token: ${{ secrets.GITHUB_TOKEN }}
+                  publish_dir: ./book

.gitignore

@@ -27,3 +27,4 @@ electron/pub
 # Auto-generated file
 /src/modules.ts
 /build_config.yaml
+/book

book.toml

@@ -0,0 +1,26 @@
+# Documentation for possible options in this file is at
+# https://rust-lang.github.io/mdBook/format/config.html
+[book]
+title = "Element Web & Desktop"
+authors = ["New Vector Ltd.", "The Matrix.org Foundation C.I.C."]
+language = "en"
+multilingual = false
+
+# The directory that documentation files are stored in
+src = "docs"
+
+[build]
+# Prevent markdown pages from being automatically generated when they're
+# linked to in SUMMARY.md
+create-missing = false
+
+[output.html]
+# Remove the numbers that appear before each item in the sidebar, as they can
+# get quite messy as we nest deeper
+no-section-label = true
+
+# The source code URL of the repository
+git-repository-url = "https://github.com/vector-im/element-web"
+
+# The path that the docs are hosted on
+site-url = "/element-web/"

docs/SUMMARY.md

@@ -0,0 +1,38 @@
+# Summary
+
+-   [Introduction](../README.md)
+
+# Usage
+
+-   [Betas](betas.md)
+-   [Labs](labs.md)
+
+# Setup
+
+-   [Config](config.md)
+-   [Custom home page](custom-home.md)
+-   [Kubernetes](kubernetes.md)
+-   [Jitsi](jitsi.md)
+-   [Encryption](e2ee.md)
+
+# Build
+
+-   [Customisations](customisations.md)
+-   [Modules](modules.md)
+-   [Native Node modules](native-node-modules.md)
+
+# Contribution
+
+-   [Choosing an issue](choosing-an-issue.md)
+-   [Translation](translating.md)
+-   [Netlify builds](pr-previews.md)
+-   [Code review](review.md)
+
+# Development
+
+-   [App load order](app-load.md)
+-   [Translation](translating-dev.md)
+-   [Theming](theming.md)
+-   [Memory profiling](memory-profiles-and-leaks.md)
+-   [Jitsi](jitsi-dev.md)
+-   [Feature flags](feature-flags.md)

element.io/develop/config.json

@@ -51,7 +51,7 @@
         "feature_video_rooms": true
     },
     "element_call": {
-        "url": "https://element-call-livekit.netlify.app"
+        "url": "https://call.element.dev"
     },
     "map_style_url": "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx"
 }

res/manifest.json

@@ -77,6 +77,11 @@
             "url": "https://play.google.com/store/apps/details?id=im.vector.app",
             "id": "im.vector.app"
         },
+        {
+            "platform": "f-droid",
+            "url": "https://f-droid.org/repository/browse/?fdid=im.vector.app",
+            "id": "im.vector.app"
+        },
         {
             "platform": "itunes",
             "url": "https://apps.apple.com/app/vector/id1083446067"

src/async-components/structures/CompatibilityView.tsx

@@ -40,12 +40,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
                 <p>
                     <strong>iOS</strong> (iPhone or iPad)
                 </p>
-                <a
-                    href={iosCustomUrl || "https://apps.apple.com/app/vector/id1083446067"}
-                    target="_blank"
-                    rel="noreferrer noopener"
-                    className="mx_ClearDecoration"
-                >
+                <a href={iosCustomUrl} target="_blank" rel="noreferrer noopener" className="mx_ClearDecoration">
                     <img height="48" src="themes/element/img/download/apple.svg" alt="Apple App Store" />
                 </a>
             </>
@@ -63,7 +58,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
         // undefined or string
         android.push(
             <a
-                href={andCustomUrl || "https://play.google.com/store/apps/details?id=im.vector.app"}
+                href={andCustomUrl}
                 target="_blank"
                 rel="noreferrer noopener"
                 className="mx_ClearDecoration"
@@ -77,7 +72,7 @@ const CompatibilityView: React.FC<IProps> = ({ onAccept }) => {
         // undefined or string
         android.push(
             <a
-                href={fdroidCustomUrl || "https://f-droid.org/repository/browse/?fdid=im.vector.app"}
+                href={fdroidCustomUrl}
                 target="_blank"
                 rel="noreferrer noopener"
                 className="mx_ClearDecoration"