From 89ee32a32d5367de70c085571b1e446cfff93e80 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:20:15 +0100 Subject: [PATCH 01/21] Upgrade matrix-js-sdk to 8.1.0-rc.1 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index d82c3d147f..07eb07d19f 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "8.1.0-rc.1", "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index 1879a8f9c5..89ce1b5f9f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.1.0-rc.1: + version "8.1.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" + integrity sha512-/qOSe0FQsbC2ITXhUbpjCIRAT78f2VHxKGqGMC2M2s5e2Mvpxcpu7lj/ONz5irUPd34Sqhj9KdIUnAqBbh3stQ== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.0.1" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" From 871733388c1187dbbbb82d16c3c5dd2a42a65c19 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:20:41 +0100 Subject: [PATCH 02/21] Upgrade matrix-react-sdk to 3.2.0-rc.1 --- package.json | 2 +- yarn.lock | 23 +++++------------------ 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index 07eb07d19f..1fcbe305c6 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.1.0-rc.1", - "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", + "matrix-react-sdk": "3.2.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 89ce1b5f9f..deebd4460b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,20 +7327,6 @@ matrix-js-sdk@8.1.0-rc.1: request "^2.88.0" unhomoglyph "^1.0.2" -"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": - version "8.0.1" - resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/a6fe4cdf1cbf56baeb538f071c27326fe98630d0" - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7349,9 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": - version "3.1.0" - resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/45b79a0b7c9237c6b4dbafd37c1a234ed2b7cf35" +matrix-react-sdk@3.2.0-rc.1: + version "3.2.0-rc.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0-rc.1.tgz#2dc7ca5d5ca4187a0973c8e2dee7e45c98923755" + integrity sha512-1BZW6WQBDlx0FhKAKBhVP2Oex2uRWSjzjKM3ccc/tHzih56XYFY4DUWf9Bd2jiPn2EyHQcwncmcFcDOC4bV4qQ== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7379,7 +7366,7 @@ matrix-mock-request@^1.2.3: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" + matrix-js-sdk "8.1.0-rc.1" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 4d95e7ec67b037697c6ae71d8604987ae424de79 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:23:40 +0100 Subject: [PATCH 03/21] Prepare changelog for v1.7.4-rc.1 --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90d58b4932..a508ce4c48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,20 @@ +Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13) +======================================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1) + + * Upgrade to React SDK 3.2.0-rc.1 and JS SDK 8.1.0-rc.1 + * Update policy links to element.io + [\#14905](https://github.com/vector-im/element-web/pull/14905) + * Update from Weblate + [\#14949](https://github.com/vector-im/element-web/pull/14949) + * Try to close notification on all platforms which support it, not just + electron + [\#14939](https://github.com/vector-im/element-web/pull/14939) + * Update bug report submission URL + [\#14903](https://github.com/vector-im/element-web/pull/14903) + * Fix arm docker build + [\#14522](https://github.com/vector-im/element-web/pull/14522) + Changes in [1.7.3](https://github.com/vector-im/element-web/releases/tag/v1.7.3) (2020-08-05) ============================================================================================= From 05816fca36e7832242a6a45ac56ba4a6eef7b3b4 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Thu, 13 Aug 2020 12:23:41 +0100 Subject: [PATCH 04/21] v1.7.4-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1fcbe305c6..35b75cc63e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.3", + "version": "1.7.4-rc.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 993fd04353cc0a54fe1276a3bbc7b381a7ea1334 Mon Sep 17 00:00:00 2001 From: Valere Date: Thu, 13 Aug 2020 19:09:36 +0200 Subject: [PATCH 05/21] Update jitsi.md Updated Element Android section --- docs/jitsi.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/jitsi.md b/docs/jitsi.md index 2ae8d9a785..76b49c9c73 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -50,7 +50,22 @@ default, and you are using riot-web 1.6 or newer, set the following on your home } ``` -## Mobile app support +## Element Android + +Element Android (1.0.5+) supports custom jitsi domain. + +1:1 calls, or calls between you and one other person, do not use Jitsi. Instead, those +calls work directly between clients or via TURN servers configured on the respective +homeservers. + +For rooms with more than 2 joined members, when creating a jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using app.element.io [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) as url. +The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `confix.xml` (jitsi.riot.im) + +For active jitsi widgets in the room, a native jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data. + +Element android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different, and never shared with the widget url). For jitsi widgets permissions is asked only once per domain (consent saved in account data). + +## Element IOS Currently the Element mobile apps do not support custom Jitsi servers and will instead use the default `jitsi.riot.im` server. When users on the mobile apps join the call, From 76a6aad35444351d49d8effc114630bc5c4ea721 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 17 Aug 2020 11:10:31 +0100 Subject: [PATCH 06/21] Add reaction preview labs flags to develop --- element.io/develop/config.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/element.io/develop/config.json b/element.io/develop/config.json index 4affa16c30..be5b58909a 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -23,7 +23,9 @@ "feature_dm_verification": "labs", "feature_bridge_state": "labs", "feature_presence_in_room_list": "labs", - "feature_custom_themes": "labs" + "feature_custom_themes": "labs", + "feature_roomlist_preview_reactions_dms": "labs", + "feature_roomlist_preview_reactions_all": "labs" }, "piwik": { "url": "https://piwik.riot.im/", From 16be9e477458d43ae90abbd047b9ed191989e125 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:09:04 +0100 Subject: [PATCH 07/21] Upgrade matrix-js-sdk to 8.1.0 --- package.json | 2 +- yarn.lock | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 35b75cc63e..46a09dc558 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.1.0-rc.1", + "matrix-js-sdk": "8.1.0", "matrix-react-sdk": "3.2.0-rc.1", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index deebd4460b..5339b9104c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,6 +7312,21 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== +matrix-js-sdk@8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0.tgz#c4e48b03a54455dda3d3e1c539ce31dbb46790ac" + integrity sha512-id/J1rBmooQWebCNO4we5W4w816+6LR503H6N1A3jn2CZl2etg86HOScmtGmw+4qkzjKJI5QkL30tvDyAJ+lxA== + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-js-sdk@8.1.0-rc.1: version "8.1.0-rc.1" resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" From 5ac891d70e4edae950d421035ffaeb5399e20c8c Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:09:23 +0100 Subject: [PATCH 08/21] Upgrade matrix-react-sdk to 3.2.0 --- package.json | 2 +- yarn.lock | 25 +++++-------------------- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 46a09dc558..cedebc224f 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "8.1.0", - "matrix-react-sdk": "3.2.0-rc.1", + "matrix-react-sdk": "3.2.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 5339b9104c..e14b64c9b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,21 +7327,6 @@ matrix-js-sdk@8.1.0: request "^2.88.0" unhomoglyph "^1.0.2" -matrix-js-sdk@8.1.0-rc.1: - version "8.1.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0-rc.1.tgz#e42ca8dae7f513f956457eeb46f03c445a3712e8" - integrity sha512-/qOSe0FQsbC2ITXhUbpjCIRAT78f2VHxKGqGMC2M2s5e2Mvpxcpu7lj/ONz5irUPd34Sqhj9KdIUnAqBbh3stQ== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" @@ -7350,10 +7335,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.2.0-rc.1: - version "3.2.0-rc.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0-rc.1.tgz#2dc7ca5d5ca4187a0973c8e2dee7e45c98923755" - integrity sha512-1BZW6WQBDlx0FhKAKBhVP2Oex2uRWSjzjKM3ccc/tHzih56XYFY4DUWf9Bd2jiPn2EyHQcwncmcFcDOC4bV4qQ== +matrix-react-sdk@3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0.tgz#4523003c8dd72f9d7c9b53d5bec3cd67fe41c52f" + integrity sha512-yywvU2lJR0s/P3Suf5SDf3Aa/vHDZjwDiR14DBsHKdP97TyugA3LKogVkjfi192+m2sMFtl8AB/raplhSz/lNg== dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7381,7 +7366,7 @@ matrix-react-sdk@3.2.0-rc.1: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.1.0-rc.1" + matrix-js-sdk "8.1.0" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From a7ac9408b8e4913bdbddf202aa1ce7e2bde08007 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:12:41 +0100 Subject: [PATCH 09/21] Prepare changelog for v1.7.4 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a508ce4c48..c7ddf3956e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.7.4](https://github.com/vector-im/element-web/releases/tag/v1.7.4) (2020-08-17) +============================================================================================= +[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.4-rc.1...v1.7.4) + + * Upgrade to React SDK 3.2.0 and JS SDK 8.1.0 + Changes in [1.7.4-rc.1](https://github.com/vector-im/element-web/releases/tag/v1.7.4-rc.1) (2020-08-13) ======================================================================================================= [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.3...v1.7.4-rc.1) From 8aa46ba700530d9d8e05ec67f4c6d7c7530ba36f Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:12:41 +0100 Subject: [PATCH 10/21] v1.7.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cedebc224f..67a4cf07d7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "riot-web", "productName": "Riot", - "version": "1.7.4-rc.1", + "version": "1.7.4", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 4a7c2318dd8d2d37ce398d9a4f73b35b70d8b99b Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:17:27 +0100 Subject: [PATCH 11/21] Reset matrix-js-sdk back to develop branch --- package.json | 2 +- yarn.lock | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 67a4cf07d7..70b5f3bfc5 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "browser-request": "^0.3.3", "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", - "matrix-js-sdk": "8.1.0", + "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", "matrix-react-sdk": "3.2.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", diff --git a/yarn.lock b/yarn.lock index e14b64c9b1..51fba154be 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7327,6 +7327,20 @@ matrix-js-sdk@8.1.0: request "^2.88.0" unhomoglyph "^1.0.2" +"matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": + version "8.1.0" + resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" + dependencies: + "@babel/runtime" "^7.8.3" + another-json "^0.2.0" + browser-request "^0.3.3" + bs58 "^4.0.1" + content-type "^1.0.2" + loglevel "^1.6.4" + qs "^6.5.2" + request "^2.88.0" + unhomoglyph "^1.0.2" + matrix-mock-request@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/matrix-mock-request/-/matrix-mock-request-1.2.3.tgz#56b15d86e2601a9b48a854844396d18caab649c8" From d969a96cd27db7d64e82c211c6a3a08fd915c378 Mon Sep 17 00:00:00 2001 From: RiotRobot Date: Mon, 17 Aug 2020 13:17:44 +0100 Subject: [PATCH 12/21] Reset matrix-react-sdk back to develop branch --- package.json | 2 +- yarn.lock | 22 +++------------------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 70b5f3bfc5..364bd9446d 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop", - "matrix-react-sdk": "3.2.0", + "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz", "prop-types": "^15.7.2", "react": "^16.9.0", diff --git a/yarn.lock b/yarn.lock index 51fba154be..4ff565f388 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7312,21 +7312,6 @@ mathml-tag-names@^2.1.1: resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz#4ddadd67308e780cf16a47685878ee27b736a0a3" integrity sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg== -matrix-js-sdk@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-8.1.0.tgz#c4e48b03a54455dda3d3e1c539ce31dbb46790ac" - integrity sha512-id/J1rBmooQWebCNO4we5W4w816+6LR503H6N1A3jn2CZl2etg86HOScmtGmw+4qkzjKJI5QkL30tvDyAJ+lxA== - dependencies: - "@babel/runtime" "^7.8.3" - another-json "^0.2.0" - browser-request "^0.3.3" - bs58 "^4.0.1" - content-type "^1.0.2" - loglevel "^1.6.4" - qs "^6.5.2" - request "^2.88.0" - unhomoglyph "^1.0.2" - "matrix-js-sdk@github:matrix-org/matrix-js-sdk#develop": version "8.1.0" resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/64cdd73b93a475d10284977b69ef73138315b3be" @@ -7349,10 +7334,9 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@3.2.0: +"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop": version "3.2.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.2.0.tgz#4523003c8dd72f9d7c9b53d5bec3cd67fe41c52f" - integrity sha512-yywvU2lJR0s/P3Suf5SDf3Aa/vHDZjwDiR14DBsHKdP97TyugA3LKogVkjfi192+m2sMFtl8AB/raplhSz/lNg== + resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/c91fc99d4bfd76808c99327979c1b7dbcb9bf093" dependencies: "@babel/runtime" "^7.10.5" await-lock "^2.0.1" @@ -7380,7 +7364,7 @@ matrix-react-sdk@3.2.0: is-ip "^2.0.0" linkifyjs "^2.1.9" lodash "^4.17.19" - matrix-js-sdk "8.1.0" + matrix-js-sdk "github:matrix-org/matrix-js-sdk#develop" minimist "^1.2.5" pako "^1.0.11" parse5 "^5.1.1" From 02e23e48b38bd3b3f32ca1dc50c634d936451c24 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 17 Aug 2020 18:20:57 +0100 Subject: [PATCH 13/21] TypeScript: enable es2019 lib for newer definitions --- tsconfig.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tsconfig.json b/tsconfig.json index 8a01ca335e..e16688adb3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,11 @@ "node", "react", "flux" + ], + "lib": [ + "es2019", + "dom", + "dom.iterable" ] }, "include": [ From 2a25c6aaa4206edcfca179d8cab0201492b730b6 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 17 Aug 2020 13:41:19 -0600 Subject: [PATCH 14/21] Update configs for new settings structure --- config.sample.json | 6 +----- element.io/app/config.json | 3 +-- element.io/develop/config.json | 16 +--------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/config.sample.json b/config.sample.json index 662865c041..52e47f03f1 100644 --- a/config.sample.json +++ b/config.sample.json @@ -26,11 +26,7 @@ "defaultCountryCode": "GB", "showLabsSettings": false, "features": { - "feature_new_spinner": "labs", - "feature_pinning": "labs", - "feature_custom_status": "labs", - "feature_custom_tags": "labs", - "feature_state_counters": "labs" + "feature_new_spinner": false }, "default_federate": true, "default_theme": "light", diff --git a/element.io/app/config.json b/element.io/app/config.json index f0af8b82bb..c8867d3dd6 100644 --- a/element.io/app/config.json +++ b/element.io/app/config.json @@ -12,8 +12,7 @@ ], "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web", "bug_report_endpoint_url": "https://element.io/bugreports/submit", - "features": { - }, + "showLabsSettings": false, "piwik": { "url": "https://piwik.riot.im/", "siteId": 1, diff --git a/element.io/develop/config.json b/element.io/develop/config.json index be5b58909a..bcf6142d18 100644 --- a/element.io/develop/config.json +++ b/element.io/develop/config.json @@ -12,21 +12,7 @@ ], "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web", "bug_report_endpoint_url": "https://element.io/bugreports/submit", - "features": { - "feature_new_spinner": "labs", - "feature_pinning": "labs", - "feature_custom_status": "labs", - "feature_custom_tags": "labs", - "feature_state_counters": "labs", - "feature_many_integration_managers": "labs", - "feature_mjolnir": "labs", - "feature_dm_verification": "labs", - "feature_bridge_state": "labs", - "feature_presence_in_room_list": "labs", - "feature_custom_themes": "labs", - "feature_roomlist_preview_reactions_dms": "labs", - "feature_roomlist_preview_reactions_all": "labs" - }, + "showLabsSettings": true, "piwik": { "url": "https://piwik.riot.im/", "siteId": 1, From 3e924941c3c6b3f29e7b889c4f6f6b9b3d181b51 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 17 Aug 2020 14:00:04 -0600 Subject: [PATCH 15/21] Update feature flags documentation for new feature behaviour --- docs/feature-flags.md | 68 +++++++++++++------------------------------ 1 file changed, 20 insertions(+), 48 deletions(-) diff --git a/docs/feature-flags.md b/docs/feature-flags.md index 115c3b25f2..5fb5545fdf 100644 --- a/docs/feature-flags.md +++ b/docs/feature-flags.md @@ -35,7 +35,7 @@ clients commit to doing the associated clean up work once a feature stabilises. When starting work on a feature, we should create a matching feature flag: 1. Add a new - [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) + [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) of the form: ```js "feature_cats": { @@ -47,17 +47,9 @@ When starting work on a feature, we should create a matching feature flag: ``` 2. Check whether the feature is enabled as appropriate: ```js - SettingsStore.isFeatureEnabled("feature_cats") + SettingsStore.getValue("feature_cats") ``` -3. Add the feature to the set of labs on - [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json) - and [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json): -```json - "features": { - "feature_cats": "labs" - }, -``` -4. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) +3. Document the feature in the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) With these steps completed, the feature is disabled by default, but can be enabled on develop and nightly by interested users for testing. @@ -67,7 +59,7 @@ The following lists a few common options. ## Enabling by default on develop and nightly -Set the feature to `enable` in the +Set the feature to `true` in the [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json) and [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json) @@ -75,34 +67,37 @@ configs: ```json "features": { - "feature_cats": "enable" + "feature_cats": true }, ``` ## Enabling by default on staging, app, and release -Set the feature to `enable` in the +Set the feature to `true` in the [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json) and [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json) configs. -**Warning:** While this does mean the feature is enabled by default for -https://app.element.io and official Element Desktop builds, it will not be enabled by -default for self-hosted installs, custom desktop builds, etc. To cover those -cases as well, the best options at the moment are converting to a regular -setting defaulted on or to remove the flag. Simply enabling the existing flag by -default in `Settings.js` -[does not work currently](https://github.com/vector-im/riot-web/issues/10360). +**Note:** The above will only enable the feature for https://app.element.io and official Element +Desktop builds. It will not be enabled for self-hosted installed, custom desktop builds, etc. To +cover these cases, change the setting's `default` in `Settings.ts` to `true`. ## Feature deployed successfully -Once we're confident that a feature is working well, we should remove the flag: +Once we're confident that a feature is working well, we should remove or convert the flag. -1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) -2. Remove all `isFeatureEnabled` lines that test for the feature's setting +If the feature is meant to be turned off/on by the user: +1. Remove `isFeature` from the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) +2. Change the `default` to `true` (if desired). 3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) -4. Remove feature state from +4. Celebrate! 🥳 + +If the feature is meant to be forced on (non-configurable): +1. Remove the [setting](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.ts) +2. Remove all `getValue` lines that test for the feature. +3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) +4. If applicable, remove the feature state from [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json), [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json), [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json), @@ -110,26 +105,3 @@ Once we're confident that a feature is working well, we should remove the flag: [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json) configs 5. Celebrate! 🥳 - -## Convert to a regular setting (optional) - -Sometimes we decide a feature should always be user-controllable as a setting -even after it has been fully deployed. In that case, we would craft a new, -regular setting: - -1. Remove the feature flag from - [settings](https://github.com/matrix-org/matrix-react-sdk/blob/develop/src/settings/Settings.js) - and add a regular setting with the appropriate levels for your feature -2. Replace the `isFeatureEnabled` lines with `getValue` or similar calls - according to the [settings - docs](https://github.com/matrix-org/matrix-react-sdk/blob/develop/docs/settings.md) - (checking carefully, as we may want a different mix of code paths when the - feature is always present but gated by a setting) -3. Remove the feature from the [labs documentation](https://github.com/vector-im/riot-web/blob/develop/docs/labs.md) -4. Remove feature state from - [develop](https://github.com/vector-im/riot-web/blob/develop/riot.im/develop/config.json), - [nightly](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/nightly/config.json), - [staging / app](https://github.com/vector-im/riot-web/blob/develop/riot.im/app/config.json), - and - [release](https://github.com/vector-im/riot-desktop/blob/develop/riot.im/release/config.json) - configs From 2c952b422befb635c586e58f1e8690e708a949e0 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Mon, 17 Aug 2020 14:02:19 -0600 Subject: [PATCH 16/21] Update config.md for new feature behaviour --- docs/config.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/config.md b/docs/config.md index d342aaf4f2..a9d05d8618 100644 --- a/docs/config.md +++ b/docs/config.md @@ -22,12 +22,12 @@ For a good example, see https://develop.element.io/config.json. `default_hs_url` is specified. When multiple sources are specified, it is unclear which should take priority and therefore the application cannot continue. * As of Element 1.4.0, identity servers are optional. See [Identity servers](#identity-servers) below. -1. `features`: Lookup of optional features that may be `enable`d, `disable`d, or - exposed to the user in the `labs` section of settings. The available - optional experimental features vary from release to release and are [documented](labs.md). The feature flag process is - [documented](feature-flags.md) as well. -1. `showLabsSettings`: Shows the "labs" tab of user settings even when no `features` are enabled - or present. Useful for getting at settings which may be otherwise hidden. +1. `features`: Lookup of optional features that may be force-enabled (`true`) or force-disabled (`false`). + When features are not listed here, their defaults will be used, and users can turn them on/off if `showLabsSettings` + allows them to. The available optional experimental features vary from release to release and are + [documented](labs.md). The feature flag process is [documented](feature-flags.md) as well. +1. `showLabsSettings`: Shows the "labs" tab of user settings. Useful to allow users to turn on experimental features + they might not otherwise have access to. 1. `brand`: String to pass to your homeserver when configuring email notifications, to let the homeserver know what email template to use when talking to you. 1. `branding`: Configures various branding and logo details, such as: From 5b5f2058927adb6f0381d0ab2957f6317e97018c Mon Sep 17 00:00:00 2001 From: Christoph Settgast Date: Wed, 19 Aug 2020 16:13:59 +0200 Subject: [PATCH 17/21] Link to Element in F-Droid as well The old app-id shows a big warning that it will no longer be maintained, so avoid linking to it (especially for self-hosted element-web installs). Signed-off-by: Christoph Settgast --- src/async-components/structures/CompatibilityView.tsx | 2 +- src/vector/mobile_guide/index.html | 2 +- src/vector/static/incompatible-browser.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/async-components/structures/CompatibilityView.tsx b/src/async-components/structures/CompatibilityView.tsx index 41d21b469c..974d8c1b80 100644 --- a/src/async-components/structures/CompatibilityView.tsx +++ b/src/async-components/structures/CompatibilityView.tsx @@ -87,7 +87,7 @@ const CompatibilityView: React.FC = ({ onAccept }) => { className="mx_ClearDecoration"> Google Play Store - F-Droid diff --git a/src/vector/mobile_guide/index.html b/src/vector/mobile_guide/index.html index acd0734797..da49907f9c 100644 --- a/src/vector/mobile_guide/index.html +++ b/src/vector/mobile_guide/index.html @@ -260,7 +260,7 @@ body { - + Get it on F-Droid. diff --git a/src/vector/static/incompatible-browser.html b/src/vector/static/incompatible-browser.html index 09e5238586..bc839d6b38 100644 --- a/src/vector/static/incompatible-browser.html +++ b/src/vector/static/incompatible-browser.html @@ -339,7 +339,7 @@ - From 8cfb0a71a0df6fe071131f6db33ff1099e0b0a39 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 19 Aug 2020 18:18:50 +0100 Subject: [PATCH 18/21] Apply suggestions from code review --- docs/jitsi.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/jitsi.md b/docs/jitsi.md index 76b49c9c73..d289cc3818 100644 --- a/docs/jitsi.md +++ b/docs/jitsi.md @@ -52,20 +52,20 @@ default, and you are using riot-web 1.6 or newer, set the following on your home ## Element Android -Element Android (1.0.5+) supports custom jitsi domain. +Element Android (1.0.5+) supports custom Jitsi domains, similar to Element Web above. 1:1 calls, or calls between you and one other person, do not use Jitsi. Instead, those calls work directly between clients or via TURN servers configured on the respective homeservers. -For rooms with more than 2 joined members, when creating a jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using app.element.io [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) as url. -The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `confix.xml` (jitsi.riot.im) +For rooms with more than 2 joined members, when creating a Jitsi conference via call/video buttons of the toolbar (not via integration manager), Element Android will create a widget using the [wrapper](https://github.com/vector-im/element-web/blob/develop/docs/jitsi-dev.md) hosted on `app.element.io`. +The domain used is the one specified by the `/.well-known/matrix/client` endpoint, and if not present it uses the fallback defined in `config.xml` (jitsi.riot.im) -For active jitsi widgets in the room, a native jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data. +For active Jitsi widgets in the room, a native Jitsi widget UI is created and points to the instance specified in the `domain` key of the widget content data. -Element android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different, and never shared with the widget url). For jitsi widgets permissions is asked only once per domain (consent saved in account data). +Element Android manages allowed native widgets permissions a bit differently than web widgets (as the data shared are different and never shared with the widget URL). For Jitsi widgets, permissions are requested only once per domain (consent saved in account data). -## Element IOS +## Element iOS Currently the Element mobile apps do not support custom Jitsi servers and will instead use the default `jitsi.riot.im` server. When users on the mobile apps join the call, From 8a8c684ef9f1ba7b2660e46ddf5c0b3a6dab86af Mon Sep 17 00:00:00 2001 From: Jonas Kress Date: Fri, 21 Aug 2020 10:06:56 +0200 Subject: [PATCH 19/21] Update links to element in the readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0f097cd137..2ab1681995 100644 --- a/README.md +++ b/README.md @@ -105,10 +105,10 @@ Running as a Desktop app ======================== Element can also be run as a desktop app, wrapped in Electron. You can download a -pre-built version from https://riot.im/download/desktop/ or, if you prefer, +pre-built version from https://element.io/get-started or, if you prefer, build it yourself. -To build it yourself, follow the instructions at https://github.com/vector-im/riot-desktop. +To build it yourself, follow the instructions at https://github.com/vector-im/element-desktop. Many thanks to @aviraldg for the initial work on the Electron integration. From 85726c604e07370ce4eb2d708b74c7f94328cd6d Mon Sep 17 00:00:00 2001 From: Jonas Kress Date: Fri, 21 Aug 2020 11:34:35 +0200 Subject: [PATCH 20/21] Change riot to element --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2ab1681995..ed951ec1ee 100644 --- a/README.md +++ b/README.md @@ -24,8 +24,8 @@ Element has several tiers of support for different environments: * Everything else For accessing Element on an Android or iOS device, we currently recommend the -native apps [riot-android](https://github.com/vector-im/riot-android) -and [riot-ios](https://github.com/vector-im/riot-ios). +native apps [element-android](https://github.com/vector-im/element-android) +and [element-ios](https://github.com/vector-im/element-ios). Getting Started =============== @@ -37,7 +37,7 @@ for those who like living dangerously. To host your own copy of Element, the quickest bet is to use a pre-built released version of Element: -1. Download the latest version from https://github.com/vector-im/riot-web/releases +1. Download the latest version from https://github.com/vector-im/element-web/releases 1. Untar the tarball on your web server 1. Move (or symlink) the `riot-x.x.x` directory to an appropriate name 1. Configure the correct caching headers in your webserver (see below) @@ -69,7 +69,7 @@ access to Element (or other apps) due to sharing the same domain. We have put some coarse mitigations into place to try to protect against this situation, but it's still not good practice to do it in the first place. See -https://github.com/vector-im/riot-web/issues/1977 for more details. +https://github.com/vector-im/element-web/issues/1977 for more details. Building From Source ==================== @@ -82,7 +82,7 @@ guide](https://classic.yarnpkg.com/en/docs/install) if you do not have it alread 1. Install or update `node.js` so that your `node` is at least v10.x. 1. Install `yarn` if not present already. -1. Clone the repo: `git clone https://github.com/vector-im/riot-web.git`. +1. Clone the repo: `git clone https://github.com/vector-im/element-web.git`. 1. Switch to the riot-web directory: `cd riot-web`. 1. Install the prerequisites: `yarn install`. * If you're using the `develop` branch, then it is recommended to set up a From c1faa541029c9830c2dac6c3f1a51e95fb24dc8a Mon Sep 17 00:00:00 2001 From: Selyan Slimane Amiri Date: Sat, 22 Aug 2020 21:16:55 +0100 Subject: [PATCH 21/21] Make kabyle translation available --- scripts/copy-res.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/copy-res.js b/scripts/copy-res.js index 71eb6b75ad..68d131c7c6 100755 --- a/scripts/copy-res.js +++ b/scripts/copy-res.js @@ -31,6 +31,7 @@ const INCLUDE_LANGS = [ {'value': 'it', 'label': 'Italiano'}, {'value': 'ja', 'label': '日本語'}, {'value': 'jbo', 'label': 'banjubu\'o'}, + {'value': 'kab', 'label': 'Taqbaylit'}, {'value': 'ko', 'label': '한국어'}, {'value': 'lt', 'label': 'Lietuvių'}, {'value': 'lv', 'label': 'Latviešu'},