diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 20e642cb921..0d52ad98dc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ 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 @@ -10,8 +10,25 @@ env: 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 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml new file mode 100644 index 00000000000..7e4e7036d0f --- /dev/null +++ b/.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 diff --git a/.gitignore b/.gitignore index b279ef0bf91..3d737137cef 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ electron/pub # Auto-generated file /src/modules.ts /build_config.yaml +/book diff --git a/book.toml b/book.toml new file mode 100644 index 00000000000..24275dc61cc --- /dev/null +++ b/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/" diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md new file mode 100644 index 00000000000..00a81e9e417 --- /dev/null +++ b/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) diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 6d3e27d5726..99b6ce8004b 100644 --- a/element.io/develop/config.json +++ b/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" } diff --git a/res/manifest.json b/res/manifest.json index 69465591e0d..f6f1e91bf47 100644 --- a/res/manifest.json +++ b/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" diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index c6f197e6da6..a9f1cce51af 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -40,12 +40,7 @@ const CompatibilityView: React.FC = ({ onAccept }) => {

iOS (iPhone or iPad)

- + Apple App Store @@ -63,7 +58,7 @@ const CompatibilityView: React.FC = ({ onAccept }) => { // undefined or string android.push( = ({ onAccept }) => { // undefined or string android.push(