Add webpack config to override UI components with customisation

Webpack config for widget customisation endpoint
Replacing the education translations with more generic ones. This is _still_ not a sustainable approach.
2021-12-16 18:20:31 +01:00 · 2021-12-16 18:20:28 +01:00 · 2021-12-16 18:17:31 +01:00 · 2021-12-16 18:16:58 +01:00 · 2021-12-16 18:16:54 +01:00 · 2021-12-16 18:13:04 +01:00
19 changed files with 3458 additions and 97 deletions
--- a/.github/workflows/triage-move-review-requests.yml
+++ b/.github/workflows/triage-move-review-requests.yml
@@ -0,0 +1,61 @@
+name: Move pull requests asking for review to the relevant project
+on:
+  pull_request:
+    types: [review_requested]
+jobs:
+  add_design_pr_to_project:
+    name: Move PRs asking for design review to the design board
+    runs-on: ubuntu-latest
+    steps:
+      - uses: octokit/graphql-action@v2.x
+        id: find_team_members
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            query find_team_members($team: String!) {
+              organization(login: "vector-im") {
+                team(slug: $team) {
+                  members {
+                    nodes {
+                      login
+                    }
+                  }
+                }
+              }
+            }
+          team: ${{ env.TEAM }}
+        env:
+          TEAM: "design"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
+      - id: any_reviewers_in_the_team
+        run: |
+          echo '${{ tojson(fromjson(steps.find_team_members.outputs.data).organization.team.members.nodes[*].login) }}' | tee /tmp/team_members.json
+          echo '${{ tojson(github.event.pull_request.requested_reviewers[*].login) }}' | tee /tmp/reviewers.json
+          jq --raw-output .[] < /tmp/team_members.json | sort | tee /tmp/team_members.txt
+          jq --raw-output .[] < /tmp/reviewers.json | sort | tee /tmp/reviewers.txt
+          if [ $(join /tmp/team_members.txt /tmp/reviewers.txt | wc -l) = 0 ]; then
+            echo "::set-output name=match::false"
+          else
+            echo "::set-output name=match::true"
+          fi
+      - uses: octokit/graphql-action@v2.x
+        id: add_to_project
+        if: >
+          (steps.any_reviewers_in_the_team.outputs.match == 'true') ||
+          (github.event.pull_request.requested_teams.slug == env.TEAM)
+        with:
+          headers: '{"GraphQL-Features": "projects_next_graphql"}'
+          query: |
+            mutation add_to_project($projectid:String!, $contentid:String!) {
+              addProjectNextItem(input:{projectId:$projectid contentId:$contentid}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }
+          projectid: ${{ env.PROJECT_ID }}
+          contentid: ${{ github.event.pull_request.node_id }}
+        env:
+          PROJECT_ID: "PN_kwDOAM0swc0sUA"
+          TEAM: "design"
+          GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -0,0 +1,30 @@
+stages:
+- build
+
+variables:
+  USE_CUSTOM_SDKS: "true"
+  JS_SDK_BRANCH: "release-v9.8.0"
+  JS_SDK_REPO: "https://github.com/matrix-org/matrix-js-sdk.git"
+  REACT_SDK_REPO: "https://gitlab-ci-token:$GL_BAYERN_REACT_SDK_TOKEN@gitlab.matrix.org/new-vector/dataport/bayern-react-sdk"
+  REACT_SDK_BRANCH: "master"
+
+docker-build:
+  tags: ['shell']
+  stage: build
+  before_script:
+  - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  - "[ -d './js-sdk' ] && rm -rf ./js-sdk"
+  - "[[ $JS_SDK_BRANCH != 'master' ]] && git clone --depth 1 --branch $JS_SDK_BRANCH $JS_SDK_REPO js-sdk && cd js-sdk && export JS_SDK_SHA=$(git rev-parse --short=12 HEAD) && cd ../ && rm -rf js-sdk"
+  - "[[ $JS_SDK_BRANCH == 'master' ]] && export JS_SDK_SHA=master"
+  - "[ -d './react-sdk' ] && rm -rf ./react-sdk"
+  - "[[ $REACT_SDK_BRANCH != 'master' ]] && git clone --depth 1 --branch $REACT_SDK_BRANCH $REACT_SDK_REPO react-sdk && cd react-sdk && export REACT_SDK_SHA=$(git rev-parse --short=12 HEAD) && cd ../ && rm -rf react-sdk"
+  - "[[ $REACT_SDK_BRANCH == 'master' ]] && export REACT_SDK_SHA=master"
+  - "[[ $CI_COMMIT_BRANCH != 'master' ]] && export ELEMENT_WEB_SHA=$(git rev-parse --short=12 HEAD)"
+  - "[[ $CI_COMMIT_BRANCH == 'master' ]] && export ELEMENT_WEB_SHA=master"
+  - "[[ -v CI_COMMIT_TAG ]] && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
+  - "([[ $CI_COMMIT_BRANCH == 'master' ]] && [[ $REACT_SDK_BRANCH == 'master' ]] && [[ $JS_SDK_BRANCH == 'master' ]]) && export SPECIAL_DOCKER_TAG=$CI_REGISTRY_IMAGE:latest"
+  - '[[ -z $SPECIAL_DOCKER_TAG ]] && export DOCKER_TAG="$CI_REGISTRY_IMAGE:$ELEMENT_WEB_SHA-react-$REACT_SDK_SHA-js-$JS_SDK_SHA" || export DOCKER_TAG="$SPECIAL_DOCKER_TAG"'
+  script:
+  - echo "Docker tag will be $DOCKER_TAG"
+  - docker build --pull -t "$DOCKER_TAG" --build-arg "USE_CUSTOM_SDKS=$USE_CUSTOM_SDKS" --build-arg "JS_SDK_BRANCH=$JS_SDK_BRANCH" --build-arg "JS_SDK_REPO=$JS_SDK_REPO" --build-arg "REACT_SDK_REPO=$REACT_SDK_REPO" --build-arg "REACT_SDK_BRANCH=$REACT_SDK_BRANCH" .
+  - docker push "$DOCKER_TAG"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,102 @@
+Changes in [1.9.7](https://github.com/vector-im/element-web/releases/tag/v1.9.7) (2021-12-13)
+=============================================================================================
+
+ * Security release with updated version of Olm to fix https://matrix.org/blog/2021/12/03/pre-disclosure-upcoming-security-release-of-libolm-and-matrix-js-sdk
+ * Fix a crash on logout
+
+Changes in [1.9.6](https://github.com/vector-im/element-web/releases/tag/v1.9.6) (2021-12-06)
+=============================================================================================
+
+## ✨ Features
+ * Add unread indicator to the timelineCard header icon ([\#7156](https://github.com/matrix-org/matrix-react-sdk/pull/7156)). Fixes #19635.
+ * Only show core navigation elements (call/chat/notification/info) when a widget is maximised ([\#7114](https://github.com/matrix-org/matrix-react-sdk/pull/7114)). Fixes #19632.
+ * Improve ThreadPanel ctx menu accessibility ([\#7217](https://github.com/matrix-org/matrix-react-sdk/pull/7217)). Fixes #19885.
+ * Allow filtering room list during treeview navigation ([\#7219](https://github.com/matrix-org/matrix-react-sdk/pull/7219)). Fixes #14702.
+ * Add right panel chat timeline ([\#7112](https://github.com/matrix-org/matrix-react-sdk/pull/7112)). Fixes #19633.
+ * Hide server options hint when disable_custom_urls is true ([\#7215](https://github.com/matrix-org/matrix-react-sdk/pull/7215)). Fixes #19919.
+ * Improve right panel resize handle usability ([\#7204](https://github.com/matrix-org/matrix-react-sdk/pull/7204)). Fixes #15145. Contributed by @weeman1337.
+ * Spaces quick settings ([\#7196](https://github.com/matrix-org/matrix-react-sdk/pull/7196)).
+ * Maximised widgets always force a call to be shown in PIP mode ([\#7163](https://github.com/matrix-org/matrix-react-sdk/pull/7163)). Fixes #19637.
+ * Group Labs flags ([\#7190](https://github.com/matrix-org/matrix-react-sdk/pull/7190)).
+ * Show room context details in forward dialog ([\#7162](https://github.com/matrix-org/matrix-react-sdk/pull/7162)). Fixes #19793.
+ * Remove chevrons from RoomSummaryCard_Button ([\#7137](https://github.com/matrix-org/matrix-react-sdk/pull/7137)). Fixes #19644.
+ * Disable op/deop commands where user has no permissions ([\#7161](https://github.com/matrix-org/matrix-react-sdk/pull/7161)). Fixes #15390.
+ * Add option to change the size of images/videos in the timeline ([\#7017](https://github.com/matrix-org/matrix-react-sdk/pull/7017)). Fixes vector-im/element-meta#49 #1520 and #19498.
+
+## 🐛 Bug Fixes
+ * Fix left panel glow in Safari ([\#7236](https://github.com/matrix-org/matrix-react-sdk/pull/7236)). Fixes #19863.
+ * Fix newline on edit messages with quotes ([\#7227](https://github.com/matrix-org/matrix-react-sdk/pull/7227)). Fixes #12535. Contributed by @renancleyson-dev.
+ * Guard against null refs in findSiblingElement ([\#7228](https://github.com/matrix-org/matrix-react-sdk/pull/7228)).
+ * Tweak bottom of space panel buttons in expanded state ([\#7213](https://github.com/matrix-org/matrix-react-sdk/pull/7213)). Fixes #19921.
+ * Fix multiline paragraph rendering as single line ([\#7210](https://github.com/matrix-org/matrix-react-sdk/pull/7210)). Fixes #8786. Contributed by @renancleyson-dev.
+ * Improve room list message previews ([\#7224](https://github.com/matrix-org/matrix-react-sdk/pull/7224)). Fixes #17101 and #16169.
+ * Fix EmojiPicker lazy loaded rendering bug ([\#7225](https://github.com/matrix-org/matrix-react-sdk/pull/7225)). Fixes #15341.
+ * Prevent default avatar in UserInfo having pointer cursor ([\#7218](https://github.com/matrix-org/matrix-react-sdk/pull/7218)). Fixes #13872.
+ * Prevent duplicate avatars in Event List Summaries ([\#7222](https://github.com/matrix-org/matrix-react-sdk/pull/7222)). Fixes #17706.
+ * Respect the home page as a context for the Home space ([\#7216](https://github.com/matrix-org/matrix-react-sdk/pull/7216)). Fixes #19554.
+ * Fix RoomUpgradeWarningBar exploding ([\#7214](https://github.com/matrix-org/matrix-react-sdk/pull/7214)). Fixes #19920.
+ * Polish threads misalignments and UI diversion ([\#7209](https://github.com/matrix-org/matrix-react-sdk/pull/7209)). Fixes #19772, #19710 #19629 and #19711.
+ * Fix Manage Restricted Join Rule Dialog for Spaces ([\#7208](https://github.com/matrix-org/matrix-react-sdk/pull/7208)). Fixes #19610.
+ * Fix wrongly showing unpin in pinned messages tile with no perms ([\#7197](https://github.com/matrix-org/matrix-react-sdk/pull/7197)). Fixes #19886.
+ * Make image size constrained by height when using the ImageSize.Large option ([\#7171](https://github.com/matrix-org/matrix-react-sdk/pull/7171)). Fixes #19788.
+ * Prevent programmatic scrolling within truncated room sublists ([\#7191](https://github.com/matrix-org/matrix-react-sdk/pull/7191)).
+ * Remove leading slash from /addwidget Jitsi confs ([\#7175](https://github.com/matrix-org/matrix-react-sdk/pull/7175)). Fixes #19839. Contributed by @AndrewFerr.
+ * Fix automatic composer focus, regressed by threads work ([\#7167](https://github.com/matrix-org/matrix-react-sdk/pull/7167)). Fixes #19479.
+ * Show space members when not invited even if summary didn't fail ([\#7153](https://github.com/matrix-org/matrix-react-sdk/pull/7153)). Fixes #19781.
+ * Prevent custom power levels from breaking roles & permissions tab ([\#7160](https://github.com/matrix-org/matrix-react-sdk/pull/7160)). Fixes #19812.
+ * Room Context Menu should respond to tag changes ([\#7154](https://github.com/matrix-org/matrix-react-sdk/pull/7154)). Fixes #19776.
+ * Fix an edge case when trying to join an upgraded room ([\#7159](https://github.com/matrix-org/matrix-react-sdk/pull/7159)).
+
+Changes in [1.9.6-rc.2](https://github.com/vector-im/element-web/releases/tag/v1.9.6-rc.2) (2021-12-01)
+=======================================================================================================
+
+ * Fixed release from correct branch
+
+Changes in [1.9.6-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.9.6-rc.1) (2021-11-30)
+=======================================================================================================
+
+## ✨ Features
+ * Tweaks to informational architecture 1.1 ([\#7052](https://github.com/matrix-org/matrix-react-sdk/pull/7052)). Fixes #19526, #19379, #17792, #16450, #19881, #19892, #19300, #19324, #17307, #17468, #19932 #19956 and #19526.
+ * Add unread indicator to the timelineCard header icon ([\#7156](https://github.com/matrix-org/matrix-react-sdk/pull/7156)). Fixes #19635 and #19635.
+ * Only show core navigation elements (call/chat/notification/info) when a widget is maximised ([\#7114](https://github.com/matrix-org/matrix-react-sdk/pull/7114)). Fixes #19632 and #19632.
+ * Improve ThreadPanel ctx menu accessibility ([\#7217](https://github.com/matrix-org/matrix-react-sdk/pull/7217)). Fixes #19885 and #19885.
+ * Allow filtering room list during treeview navigation ([\#7219](https://github.com/matrix-org/matrix-react-sdk/pull/7219)). Fixes #14702 and #14702.
+ * Add right panel chat timeline ([\#7112](https://github.com/matrix-org/matrix-react-sdk/pull/7112)). Fixes #19633 and #19633.
+ * Hide server options hint when disable_custom_urls is true ([\#7215](https://github.com/matrix-org/matrix-react-sdk/pull/7215)). Fixes #19919 and #19919.
+ * Improve right panel resize handle usability ([\#7204](https://github.com/matrix-org/matrix-react-sdk/pull/7204)). Fixes #15145 and #15145. Contributed by @weeman1337.
+ * Spaces quick settings ([\#7196](https://github.com/matrix-org/matrix-react-sdk/pull/7196)).
+ * Maximised widgets always force a call to be shown in PIP mode ([\#7163](https://github.com/matrix-org/matrix-react-sdk/pull/7163)). Fixes #19637 and #19637.
+ * Group Labs flags ([\#7190](https://github.com/matrix-org/matrix-react-sdk/pull/7190)).
+ * Show room context details in forward dialog ([\#7162](https://github.com/matrix-org/matrix-react-sdk/pull/7162)). Fixes #19793 and #19793.
+ * Remove chevrons from RoomSummaryCard_Button ([\#7137](https://github.com/matrix-org/matrix-react-sdk/pull/7137)). Fixes #19644 and #19644.
+ * Disable op/deop commands where user has no permissions ([\#7161](https://github.com/matrix-org/matrix-react-sdk/pull/7161)). Fixes #15390 and #15390.
+ * Add option to change the size of images/videos in the timeline ([\#7017](https://github.com/matrix-org/matrix-react-sdk/pull/7017)). Fixes vector-im/element-meta#49, #1520 #19498 and vector-im/element-meta#49.
+
+## 🐛 Bug Fixes
+ * Fix links being parsed as markdown links improperly ([\#7200](https://github.com/matrix-org/matrix-react-sdk/pull/7200)).
+ * Fix left panel glow in Safari ([\#7236](https://github.com/matrix-org/matrix-react-sdk/pull/7236)). Fixes #19863 and #19863.
+ * Fix newline on edit messages with quotes ([\#7227](https://github.com/matrix-org/matrix-react-sdk/pull/7227)). Fixes #12535 and #12535. Contributed by @renancleyson-dev.
+ * Guard against null refs in findSiblingElement ([\#7228](https://github.com/matrix-org/matrix-react-sdk/pull/7228)).
+ * Tweak bottom of space panel buttons in expanded state ([\#7213](https://github.com/matrix-org/matrix-react-sdk/pull/7213)). Fixes #19921 and #19921.
+ * Fix multiline paragraph rendering as single line ([\#7210](https://github.com/matrix-org/matrix-react-sdk/pull/7210)). Fixes #8786 and #8786. Contributed by @renancleyson-dev.
+ * Improve room list message previews ([\#7224](https://github.com/matrix-org/matrix-react-sdk/pull/7224)). Fixes #17101 #16169 and #17101.
+ * Fix EmojiPicker lazy loaded rendering bug ([\#7225](https://github.com/matrix-org/matrix-react-sdk/pull/7225)). Fixes #15341 and #15341.
+ * Prevent default avatar in UserInfo having pointer cursor ([\#7218](https://github.com/matrix-org/matrix-react-sdk/pull/7218)). Fixes #13872 and #13872.
+ * Prevent duplicate avatars in Event List Summaries ([\#7222](https://github.com/matrix-org/matrix-react-sdk/pull/7222)). Fixes #17706 and #17706.
+ * Respect the home page as a context for the Home space ([\#7216](https://github.com/matrix-org/matrix-react-sdk/pull/7216)). Fixes #19554 and #19554.
+ * Fix RoomUpgradeWarningBar exploding ([\#7214](https://github.com/matrix-org/matrix-react-sdk/pull/7214)). Fixes #19920 and #19920.
+ * Polish threads misalignments and UI diversion ([\#7209](https://github.com/matrix-org/matrix-react-sdk/pull/7209)). Fixes #19772, #19710, #19629 #19711 and #19772.
+ * Fix Manage Restricted Join Rule Dialog for Spaces ([\#7208](https://github.com/matrix-org/matrix-react-sdk/pull/7208)). Fixes #19610 and #19610.
+ * Fix wrongly showing unpin in pinned messages tile with no perms ([\#7197](https://github.com/matrix-org/matrix-react-sdk/pull/7197)). Fixes #19886 and #19886.
+ * Make image size constrained by height when using the ImageSize.Large option ([\#7171](https://github.com/matrix-org/matrix-react-sdk/pull/7171)). Fixes #19788 and #19788.
+ * Prevent programmatic scrolling within truncated room sublists ([\#7191](https://github.com/matrix-org/matrix-react-sdk/pull/7191)).
+ * Remove leading slash from /addwidget Jitsi confs ([\#7175](https://github.com/matrix-org/matrix-react-sdk/pull/7175)). Fixes #19839 and #19839. Contributed by @AndrewFerr.
+ * Fix automatic composer focus, regressed by threads work ([\#7167](https://github.com/matrix-org/matrix-react-sdk/pull/7167)). Fixes #19479 and #19479.
+ * Show space members when not invited even if summary didn't fail ([\#7153](https://github.com/matrix-org/matrix-react-sdk/pull/7153)). Fixes #19781 and #19781.
+ * Prevent custom power levels from breaking roles & permissions tab ([\#7160](https://github.com/matrix-org/matrix-react-sdk/pull/7160)). Fixes #19812 and #19812.
+ * Room Context Menu should respond to tag changes ([\#7154](https://github.com/matrix-org/matrix-react-sdk/pull/7154)). Fixes #19776.
+ * Fix an edge case when trying to join an upgraded room ([\#7159](https://github.com/matrix-org/matrix-react-sdk/pull/7159)).
+
 Changes in [1.9.5](https://github.com/vector-im/element-web/releases/tag/v1.9.5) (2021-11-22)
 =============================================================================================

--- a/7
+++ b/7
@@ -16,15 +16,12 @@ WORKDIR /src
 COPY . /src
 RUN dos2unix /src/scripts/docker-link-repos.sh && bash /src/scripts/docker-link-repos.sh
 RUN yarn --network-timeout=100000 install
-RUN yarn build
+
+RUN dos2unix /src/scripts/docker-package.sh && bash /src/scripts/docker-package.sh

 # Copy the config now so that we don't create another layer in the app image
 RUN cp /src/config.sample.json /src/webapp/config.json

-# Ensure we populate the version file
-RUN dos2unix /src/scripts/docker-write-version.sh && bash /src/scripts/docker-write-version.sh
-
-
 # App
 FROM nginx:alpine

--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "element-web",
-  "version": "1.9.5",
+  "version": "1.9.7",
  "description": "A feature-rich client for Matrix.org",
  "author": "New Vector Ltd.",
  "repository": {
@@ -55,13 +55,13 @@
    "test": "jest"
  },
  "dependencies": {
-    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz",
+    "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz",
    "browser-request": "^0.3.3",
    "gfm.css": "^1.1.2",
    "jsrsasign": "^10.2.0",
    "katex": "^0.12.0",
-    "matrix-js-sdk": "15.1.1",
-    "matrix-react-sdk": "3.35.1",
+    "matrix-js-sdk": "15.2.1",
+    "matrix-react-sdk": "3.36.1",
    "matrix-widget-api": "^0.1.0-beta.17",
    "prop-types": "^15.7.2",
    "react": "17.0.2",
@@ -99,7 +99,7 @@
    "@types/sanitize-html": "^2.3.1",
    "@typescript-eslint/eslint-plugin": "^4.17.0",
    "@typescript-eslint/parser": "^4.17.0",
-    "allchange": "^1.0.5",
+    "allchange": "^1.0.6",
    "autoprefixer": "^9.8.6",
    "babel-jest": "^26.6.3",
    "babel-loader": "^8.2.2",
--- a/scripts/ci_package.sh
+++ b/scripts/ci_package.sh
@@ -1,17 +1,11 @@
 #!/bin/bash

-# Runs package.sh setting the version to git hashes of the element-web,
-# react-sdk & js-sdk checkouts, for the case where these dependencies
-# are git checkouts.
+# Runs package.sh, passing DIST_VERSION determined by git

 set -ex

 rm dist/element-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist

-# Since the deps are fetched from git, we can rev-parse
-REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
-JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
+DIST_VERSION=`$(dirname $0)/get-version-from-git.sh`

-VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
-
-CI_PACKAGE=true DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA scripts/package.sh
+CI_PACKAGE=true DIST_VERSION=$DIST_VERSION scripts/package.sh
--- a/scripts/docker-write-version.sh
+++ b/scripts/docker-write-version.sh
@@ -13,10 +13,9 @@ DIST_VERSION=$TAG
 # for an appropriately tagged branch as well (heads/v1.2.3).
 if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
 then
-    REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
-    JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
-    VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
-    DIST_VERSION=$VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA
+    DIST_VERSION=`$(dirname $0)/get-version-from-git.sh`
 fi

+DIST_VERSION=`$(dirname $0)/normalize-version.sh ${DIST_VERSION}`
+VERSION=$DIST_VERSION yarn build
 echo $DIST_VERSION > /src/webapp/version
--- a/scripts/get-version-from-git.sh
+++ b/scripts/get-version-from-git.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# Echoes a version based on the git hashes of the element-web, react-sdk & js-sdk checkouts, for the case where
+# these dependencies are git checkouts.
+
+# Since the deps are fetched from git, we can rev-parse
+REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
+JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
+VECTOR_SHA=$(git rev-parse --short=12 HEAD) # use the ACTUAL SHA rather than assume develop
+echo $VECTOR_SHA-react-$REACT_SHA-js-$JSSDK_SHA
--- a/scripts/normalize-version.sh
+++ b/scripts/normalize-version.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# If $1 looks like v1.2.3 or v1.2.3-foo, strip the leading v, then print it to stdout
+if [[ $1 =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
+    echo ${1:1}
+else
+    echo $1
+fi
--- a/scripts/package.sh
+++ b/scripts/package.sh
@@ -21,12 +21,7 @@ cp -r webapp element-$version
 # Just in case you have a local config, remove it before packaging
 rm element-$version/config.json || true

-# if $version looks like semver with leading v, strip it before writing to file
-if [[ ${version} =~ ^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+(-.+)?$ ]]; then
-    echo ${version:1} > element-$version/version
-else
-    echo ${version} > element-$version/version
-fi
+$(dirname $0)/normalize-version.sh ${version} > element-$version/version

 tar chvzf dist/element-$version.tar.gz element-$version
 rm -r element-$version
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
--- a/src/i18n/strings/fy.json
+++ b/src/i18n/strings/fy.json
@@ -1,36 +1,36 @@
 {
-    "Sign In": "Ynskriuwe",
-    "Failed to start": "Iepenjen mislearre",
-    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jo kinne fierder gean mei jo eigen browser, mar guon funksjes kinne net wurkje en uterlik kin de applikaasje der ôfwikend út sjen.",
-    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Graach <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of<safariLink>Safari</safariLink> ynstallearre foar de beste ûnderfining.",
-    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brûkt avansearre browser funksjes dy net stipe wurde troch de browser dy jo no brûke.",
-    "Powered by Matrix": "Fersoarge troch Matrix",
+    "Sign In": "Oanmelde",
+    "Failed to start": "Opstarten mislearre",
+    "You can continue using your current browser, but some or all features may not work and the look and feel of the application may be incorrect.": "Jo kinne fierder gean mei jo eigen browser, mar guon funksjes kinne net wurkje en uterlik kin de applikaasje der ôfwikend útsjen.",
+    "Please install <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, or <safariLink>Safari</safariLink> for the best experience.": "Graach <chromeLink>Chrome</chromeLink>, <firefoxLink>Firefox</firefoxLink>, of<safariLink>Safari</safariLink> ynstallearje foar de beste ûnderfining.",
+    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s brûkt avansearre browserfunksjes dy’t net stipe wurde troch de browser dy’t jo no brûke.",
+    "Powered by Matrix": "Mooglik makke troch Matrix",
    "%(brand)s Desktop (%(platformName)s)": "%(brand)s Desktop (%(platformName)s)",
    "Previous/next recently visited room or community": "Foarige/Folgjende resintlik besochte keamer as mienskip",
    "Switch to space by number": "Wikselje fan romte mei nûmer",
-    "Unexpected error preparing the app. See console for details.": "Ûnferwachte flater by it klearmeitsjen fan de applikaasje. Sjoch yn'e konsole foar details.",
+    "Unexpected error preparing the app. See console for details.": "Unferwachte flater by it klearmeitsjen fan de applikaasje. Sjoch yn de console foar details.",
    "The message from the parser is: %(message)s": "It berjocht fan de ferwurker is: %(message)s",
-    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jo Element konfiguraasje hat ûnjildige JSON. Nei dat jo dit oplost ha kin dizze side ferfarske wurde.",
+    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Jo Element-konfiguraasje hat ûnjildige JSON. Nei dat jo dit oplost ha, kin dizze side ferfarske wurde.",
    "Use %(brand)s on mobile": "Brûk %(brand)s op mobyl",
    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Desintralisearre, fersifere chat &amp; gearwurking fersoarge troch [matrix]",
-    "You need to be using HTTPS to place a screen-sharing call.": "Jo moatte HTTPS brûke om te skiljen en jo skermynhâld te dielen.",
+    "You need to be using HTTPS to place a screen-sharing call.": "Oproppen mei skerm dielen fereasket HTTPS.",
    "%(appName)s (%(browserName)s, %(osName)s)": "%(appName)s (%(browserName)s, %(osName)s)",
-    "Go to your browser to complete Sign In": "Gean nei jo browser om it ynskriuwen ôf te rûnen",
-    "Download Completed": "Klear mei Delheljen",
-    "Unable to load config file: please refresh the page to try again.": "Kin konfiguraasje bestân net lade: ferfarskje de side en probearje it noch ris.",
+    "Go to your browser to complete Sign In": "Gean nei jo browser om it ynskriuwen te foltôgjen",
+    "Download Completed": "Download foltôge",
+    "Unable to load config file: please refresh the page to try again.": "Kin konfiguraasjebestân net lade: ferfarskje de side en probearje it nochris.",
    "Open user settings": "Brûkersynstellingen iepenje",
-    "Dismiss": "Negearre",
+    "Dismiss": "Slute",
    "Explore rooms": "Keamers ûntdekke",
-    "Create Account": "Account Meitsje",
+    "Create Account": "Registrearje",
    "Welcome to Element": "Wolkom by Element",
    "I understand the risks and wish to continue": "Ik begryp de risiko's en wol graach fierder gean",
    "Go to element.io": "Gean nei element.io",
    "Your browser can't run %(brand)s": "Jo browser kin %(brand)s net útfiere",
    "Unsupported browser": "Net stipe browser",
-    "Unknown device": "Ûnbekend apparaat",
+    "Unknown device": "Unbekend apparaat",
    "Open": "Iepenje",
-    "Invalid JSON": "Ûnjildiche JSON",
+    "Invalid JSON": "Unjildige JSON",
    "Your Element is misconfigured": "Jo Element is net goed konfigurearre",
-    "Invalid configuration: no default server specified.": "Ûnjildiche konfiguraasje: gjin standert tsjinner selektearre.",
-    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Ûnjildige konfiguraasje: kin allinnich kieze út default_server_config, default_server_name, as default_hs_url."
+    "Invalid configuration: no default server specified.": "Unjildiche konfiguraasje: gjin standertserver selektearre.",
+    "Invalid configuration: can only specify one of default_server_config, default_server_name, or default_hs_url.": "Unjildige konfiguraasje: kin allinnich kieze út default_server_config, default_server_name, as default_hs_url."
 }
--- a/src/i18n/strings/id.json
+++ b/src/i18n/strings/id.json
@@ -4,13 +4,13 @@
    "Unknown device": "Perangkat tidak dikenal",
    "You need to be using HTTPS to place a screen-sharing call.": "Anda perlu menggunakan HTTPS untuk melakukan panggilan berbagi layar.",
    "Welcome to Element": "Selamat datang di Element",
-    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Obrolan terenkripsi, terdesentralisasi &amp; kolaborasi diberdayakan oleh [matrix]",
+    "Decentralised, encrypted chat &amp; collaboration powered by [matrix]": "Obrolan &amp; kolaborasi terenkripsi dan terdesentralisasi diberdayakan oleh [matrix]",
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfigurasi Element Anda berisi JSON yang tidak valid. Mohon perbaiki masalahnya dan muat ulang halamannya.",
    "Invalid configuration: no default server specified.": "Konfigurasi tidak valid: server bawaan belum ditentukan.",
    "Missing indexeddb worker script!": "Tidak ada script worker indexeddb!",
    "Explore rooms": "Jelajahi ruangan",
    "Create Account": "Buat Akun",
-    "Switch to space by number": "Beralih ke space dengan nomor",
+    "Switch to space by number": "Beralih ke space bedasarkan angka",
    "Go to your browser to complete Sign In": "Buka browser Anda untuk menyelesaikan Sign In",
    "Sign In": "Masuk",
    "Failed to start": "Gagal untuk memulai",
@@ -28,7 +28,7 @@
    "Previous/next recently visited room or community": "Ruangan atau komunitas yang baru saja dikunjungi sebelumnya/berikutnya",
    "Open user settings": "Buka pengaturan pengguna",
    "Open": "Buka",
-    "Download Completed": "Unduh Selesai",
+    "Download Completed": "Unduhan Selesai",
    "Unexpected error preparing the app. See console for details.": "Kesalahan tak terduga saat menyiapkan aplikasi. Lihat konsol untuk detail.",
    "Unable to load config file: please refresh the page to try again.": "Tidak dapat memuat file konfigurasi: mohon muat ulang halaman ini untuk mencoba lagi.",
    "Invalid JSON": "JSON tidak valid",
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -34,5 +34,5 @@
    "%(brand)s uses advanced browser features which aren't supported by your current browser.": "%(brand)s gebruikt geavanceerde functies die niet ondersteund worden in uw huidige browser.",
    "Powered by Matrix": "Mogelijk gemaakt door Matrix",
    "Use %(brand)s on mobile": "Gebruik %(brand)s op uw mobiel",
-    "Switch to space by number": "Wissel naar ruimte met nummer"
+    "Switch to space by number": "Wissel naar Space met nummer"
 }
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -33,5 +33,6 @@
    "Your Element configuration contains invalid JSON. Please correct the problem and reload the page.": "Konfiguracja Elementa zawiera niepoprawny JSON. Popraw konfiguracje i odśwież stronę.",
    "Your Element is misconfigured": "Element jest nieprawidłowo skonfigurowany",
    "Powered by Matrix": "Zasilane przez Matrix",
-    "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie"
+    "Use %(brand)s on mobile": "Użyj %(brand)s w telefonie",
+    "Switch to space by number": "Przełącz na przestrzeń według numeru"
 }
--- a/src/vector/jitsi/index.html
+++ b/src/vector/jitsi/index.html
@@ -11,9 +11,9 @@
        <div class="joinConferencePrompt">
            <span class="icon"><!-- managed by CSS --></span>
            <!-- TODO: i18n -->
-            <h2>Jitsi Video Conference</h2>
+            <h2>Videokonferenz</h2>
            <div id="widgetActionContainer">
-                <button type="button" id="joinButton">Join Conference</button>
+                <button type="button" id="joinButton">Videokonferenz beitreten</button>
            </div>
        </div>
    </div>
--- a/src/vector/platform/WebPlatform.ts
+++ b/src/vector/platform/WebPlatform.ts
@@ -33,8 +33,6 @@ import { logger } from "matrix-js-sdk/src/logger";
 const POKE_RATE_MS = 10 * 60 * 1000; // 10 min

 export default class WebPlatform extends VectorBasePlatform {
-    private runningVersion: string = null;
-
    constructor() {
        super();
        // Register service worker if available on this platform
@@ -102,14 +100,14 @@ export default class WebPlatform extends VectorBasePlatform {
        return notification;
    }

-    private getVersion(): Promise<string> {
+    private getMostRecentVersion(): Promise<string> {
        // We add a cachebuster to the request to make sure that we know about
        // the most recent version on the origin server. That might not
        // actually be the version we'd get on a reload (particularly in the
        // presence of intermediate caching proxies), but still: we're trying
        // to tell the user that there is a new version.

-        return new Promise(function(resolve, reject) {
+        return new Promise((resolve, reject) => {
            request(
                {
                    method: "GET",
@@ -123,18 +121,24 @@ export default class WebPlatform extends VectorBasePlatform {
                        return;
                    }

-                    const ver = body.trim();
-                    resolve(ver);
+                    resolve(this.getNormalizedAppVersion(body.trim()));
                },
            );
        });
    }

-    getAppVersion(): Promise<string> {
-        if (this.runningVersion !== null) {
-            return Promise.resolve(this.runningVersion);
+    getNormalizedAppVersion(version: string): string {
+        // if version looks like semver with leading v, strip it
+        // (matches scripts/normalize-version.sh)
+        const semVerRegex = new RegExp("^v[0-9]+.[0-9]+.[0-9]+(-.+)?$");
+        if (semVerRegex.test(version)) {
+            return version.substr(1);
        }
-        return this.getVersion();
+        return version;
+    }
+
+    getAppVersion(): Promise<string> {
+        return Promise.resolve(this.getNormalizedAppVersion(process.env.VERSION));
    }

    startUpdater() {
@@ -147,12 +151,12 @@ export default class WebPlatform extends VectorBasePlatform {
    }

    pollForUpdate = () => {
-        return this.getVersion().then((ver) => {
-            if (this.runningVersion === null) {
-                this.runningVersion = ver;
-            } else if (this.runningVersion !== ver) {
-                if (this.shouldShowUpdate(ver)) {
-                    showUpdateToast(this.runningVersion, ver);
+        return this.getMostRecentVersion().then((mostRecentVersion) => {
+            const currentVersion = this.getNormalizedAppVersion(process.env.VERSION);
+
+            if (currentVersion !== mostRecentVersion) {
+                if (this.shouldShowUpdate(mostRecentVersion)) {
+                    showUpdateToast(currentVersion, mostRecentVersion);
                }
                return { status: UpdateCheckStatus.Ready };
            } else {
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -39,6 +39,17 @@ function getActiveThemes() {
    return themes;
 }

+const additionalPlugins = [
+    new webpack.NormalModuleReplacementPlugin(
+        /src[\/\\]customisations[\/\\]WidgetVariables\.ts/,
+        path.resolve(require.resolve("matrix-react-sdk/package.json"), '..', 'src', 'customisations', 'bayern', 'BayernWidgetVariableCustomisations.ts'),
+    ),
+    new webpack.NormalModuleReplacementPlugin(
+        /src[\/\\]customisations[\/\\]ComponentVisibility\.ts/,
+        path.resolve(require.resolve("matrix-react-sdk/package.json"), '..', 'src', 'customisations', 'bayern', 'BayernComponentVisibilityCustomisations.ts'),
+    ),
+];
+
 module.exports = (env, argv) => {
    // Establish settings based on the environment and args.
    //
@@ -546,6 +557,7 @@ module.exports = (env, argv) => {
                    include: "./webapp/bundles",
                }),
            new webpack.EnvironmentPlugin(['VERSION']),
+            ...additionalPlugins,
        ].filter(Boolean),

        output: {
--- a/yarn.lock
+++ b/yarn.lock
@@ -1306,9 +1306,9 @@
    "@types/yargs" "^16.0.0"
    chalk "^4.0.0"

-"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz":
-  version "3.2.3"
-  resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.3.tgz#cc332fdd25c08ef0e40f4d33fc3f822a0f98b6f4"
+"@matrix-org/olm@https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz":
+  version "3.2.8"
+  resolved "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz#8d53636d045e1776e2a2ec6613e57330dd9ce856"

 "@mrmlnc/readdir-enhanced@^2.2.1":
  version "2.2.1"
@@ -2185,10 +2185,10 @@ ajv@^8.0.1:
    require-from-string "^2.0.2"
    uri-js "^4.2.2"

-allchange@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.5.tgz#9496425eea8ff1a2e57b37d059333df6c3d37382"
-  integrity sha512-g3VYQfhvc42L0Mr9JTsZlVSrms4TbvqrvONj13M8NHKvp25XR9d5xS05wXqh9+mh0tYcAWDrOvAoceCzSzijBA==
+allchange@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/allchange/-/allchange-1.0.6.tgz#f905918255541dc92d6a1f5cdf758db4597f569c"
+  integrity sha512-37a4J55oSxhLmlS/DeBOKjKn5dbjkyR4qMJ9is8+CKLPTe7NybcWBYvrPLr9kVLBa6aigWrdovRHrQj/4v6k4w==
  dependencies:
    "@actions/core" "^1.4.0"
    "@actions/github" "^5.0.0"
@@ -7854,10 +7854,10 @@ mathml-tag-names@^2.1.3:
  resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3"
  integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==

-matrix-js-sdk@15.1.1:
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.1.1.tgz#791aefb2c68e1e8d398beee3eedcb6c23b63315d"
-  integrity sha512-tKZQLFwYMQk2G4nmLNR0cDDXcfDkdzJGyg2S15HooB2aI7/Ev9PhCczkw+xzwhJusxzfa8j+yx52KjMXUb81WQ==
+matrix-js-sdk@15.2.1:
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-15.2.1.tgz#61e9742ccacfe486231415372e12cb13607b5d7c"
+  integrity sha512-e0/NE6LUfDLKLdWNFyH5OGt2QHybandrC0x9qgj7P1/fe+zgLGGd8W4XGDa5CMHjjqm/OoLMam44+0+FafojlQ==
  dependencies:
    "@babel/runtime" "^7.12.5"
    another-json "^0.2.0"
@@ -7878,10 +7878,10 @@ matrix-mock-request@^1.2.3:
    bluebird "^3.5.0"
    expect "^1.20.2"

-matrix-react-sdk@3.35.1:
-  version "3.35.1"
-  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.35.1.tgz#e5773633d26d83dfbb839ad29f83c06abd70752f"
-  integrity sha512-pX7sZ4LNWznYQ3eCfXXWQWcUSQy3pjxQ03VAiTxpJcXhSvHuK2iCtxMXCUObhr9vO1YqaiyJS5UMnT7+n1Q7gw==
+matrix-react-sdk@3.36.1:
+  version "3.36.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.36.1.tgz#0970b5e707e5dfc07dd708a3e30f7050296fcc31"
+  integrity sha512-5L6SoMt3S1gjvB4AviR1Duc6sSVqf1hSq7aW8JH1houF3N7cYlNDJL5RXQ+G3iFqMlE+QpEUOApfN45WjLA+Bw==
  dependencies:
    "@babel/runtime" "^7.12.5"
    "@sentry/browser" "^6.11.0"
@@ -7912,7 +7912,7 @@ matrix-react-sdk@3.35.1:
    katex "^0.12.0"
    linkifyjs "^2.1.9"
    lodash "^4.17.20"
-    matrix-js-sdk "15.1.1"
+    matrix-js-sdk "15.2.1"
    matrix-widget-api "^0.1.0-beta.17"
    minimist "^1.2.5"
    opus-recorder "^8.0.3"
Author	SHA1	Message	Date
Travis Ralston	0996956308	Add webpack config to override UI components with customisation	2021-12-16 18:20:31 +01:00
Travis Ralston	86a4d70bcf	Webpack config for widget customisation endpoint	2021-12-16 18:20:28 +01:00
Tom	e2a4d7a568	Replacing the education translations with more generic ones. This is _still_ not a sustainable approach.	2021-12-16 18:17:31 +01:00
Tom	12fb012b6f	Adding missing translations	2021-12-16 18:16:58 +01:00
Tom	118bd8f4fa	Replacing the education translations with more generic ones. This is _still_ not a sustainable approach.	2021-12-16 18:16:54 +01:00
Ben Banfield-Zanin	2f9122d456	s/JS_SDK_REF/JS_SDK_BRANCH/	2021-12-16 18:13:04 +01:00
Tom	c9ac4d2bf2	Update .gitlab-ci.yml	2021-12-16 18:13:04 +01:00
Arun Neelicattu	5e13a30065	ci: use toml/changes branch for react-sdk testing	2021-12-16 18:13:04 +01:00
Tom	ba11162cee	Testing bundling all the translation changes into eleweb. Not a long term solution.	2021-12-16 18:13:01 +01:00
Arun Babu Neelicattu	341d41965f	Revert "ci: build container without cache" This reverts commit 19c33f988d13ec1705187c8c60d848960af7a56c.	2021-12-16 18:12:10 +01:00
Arun Neelicattu	186b4cb3f8	ci: build container without cache	2021-12-16 18:12:10 +01:00
Tom	b338f3f9bb	Translate the static jitsi file to German	2021-12-16 18:12:10 +01:00
Travis Ralston	0f31e9f23a	Fix build?	2021-12-16 18:12:10 +01:00
Travis Ralston	8944b48e2d	Pin js-sdk	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	e69e3ae90f	I hate bash	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	72596694af	Attempt to make master build latest again	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	3faccf182e	Do spaces help?	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	70743d0b9a	Use some bashisms?	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	b1a29294e6	Attempt to use nice ref names when possible	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	3547e468c2	Document what the tag will be	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	159adcc87f	Remove SDK directories after use	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	40936b3bf6	Blank script tags aren't allowed	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	f41b1c831c	Add stub script	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	2bfff82b30	Improve the pipeline to attempt to distinguish branches for react-sdk	2021-12-16 18:12:10 +01:00
Ben Banfield-Zanin	b09fa73160	Gitlab pipeline	2021-12-16 18:10:21 +01:00
RiotRobot	eae38311b2	v1.9.7	2021-12-13 15:36:54 +00:00
RiotRobot	1b6b1a8621	Prepare changelog for v1.9.7	2021-12-13 15:36:53 +00:00
RiotRobot	80cf11135d	Upgrade matrix-react-sdk to 3.36.1	2021-12-13 15:33:35 +00:00
RiotRobot	9eb5af53e2	Upgrade matrix-js-sdk to 15.2.1	2021-12-13 15:32:59 +00:00
David Baker	0637c2e74d	update olm to 3.2.8 (#20160 )	2021-12-13 14:59:21 +00:00
James Salter	159f1962a1	Fix Docker build versioning (#20077 ) (#20078 ) * Centralise version scripts and fix Docker version * Refactor generation of a git-hash-based version into get-version-from-git * Refactor normalization of versions (stripping leading v) into normalize-version.sh * Call get-version-from-git from ci_package.sh, call normalize-version from package.sh * Refactor docker-write-version.sh into docker-package.sh, which both writes the version file and invokes yarn build passing VERSION * Normalize the version received from the server	2021-12-07 15:35:23 +11:00
RiotRobot	996d79847a	v1.9.6	2021-12-06 15:38:51 +00:00
RiotRobot	15df3bc816	Prepare changelog for v1.9.6	2021-12-06 15:38:51 +00:00
RiotRobot	8247318399	Upgrade matrix-react-sdk to 3.36.0	2021-12-06 15:37:34 +00:00
RiotRobot	4bb310ad3d	Upgrade matrix-js-sdk to 15.2.0	2021-12-06 15:36:55 +00:00
James Salter	39901b8d72	Normalize the local app version (#20062 ) We need to strip the leading v from the local app version as well as the one fetched from the server	2021-12-06 15:09:23 +00:00
RiotRobot	b14b2967ec	v1.9.6-rc.2	2021-12-01 11:50:27 +00:00
RiotRobot	bacddc5dfc	Prepare changelog for v1.9.6-rc.2	2021-12-01 11:50:27 +00:00
RiotRobot	a799672bd3	Upgrade matrix-react-sdk to 3.36.0-rc.1	2021-12-01 11:45:17 +00:00
RiotRobot	87882dd6a3	Upgrade matrix-js-sdk to 15.2.0-rc.1	2021-12-01 11:44:55 +00:00
J. Ryan Stinnett	f496d6d5bf	Upgrade allchange to 1.0.6 (#19969 )	2021-11-30 17:56:04 +00:00
Element Translate Bot	ae048025e4	Translations update from Weblate (#19966 ) * Translated using Weblate (Indonesian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/id/ * Translated using Weblate (Vietnamese) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/vi/ * Translated using Weblate (Turkish) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/tr/ * Translated using Weblate (Frisian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/fy/ * Translated using Weblate (Polish) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/pl/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (34 of 34 strings) Translation: Element Web/element-web Translate-URL: https://translate.element.io/projects/element-web/element-web/nl/ Co-authored-by: Linerly <linerly@protonmail.com> Co-authored-by: Weblate <translate@riot.im> Co-authored-by: Dinh Quang Tuyen <tuyen.dinh@aarenet.com> Co-authored-by: Ege <alikemal@riseup.net> Co-authored-by: Fjoerfoks <fryskefirefox@gmail.com> Co-authored-by: Adrian Środoń <adrian.srodon@gmail.com> Co-authored-by: jelv <post@jelv.nl>	2021-11-30 17:47:04 +00:00
Andy Balaam	090fc808bb	Move workflow env sections into steps for PR workflow (#19926 )	2021-11-29 17:22:53 +00:00
Andy Balaam	10e121a514	Review requests workflow (#19911 ) * Review requests workflow * Move env section up * Use jq instead of sed to process JSON	2021-11-26 16:23:07 +00:00
James Salter	194aeac19e	Get version from build VERSION variable (#19857 ) * Fetch version from VERSION set during build * When polling for new versions, compare to VERSION set during build * Strip leading v from version, matching package.sh	2021-11-23 18:42:24 +11:00
RiotRobot	9746517ef7	Reset matrix-react-sdk back to develop branch	2021-11-22 14:43:05 +00:00
RiotRobot	40892ad087	Reset matrix-js-sdk back to develop branch	2021-11-22 14:42:52 +00:00