From 8ed44e6b641526fed2c73d3965848502127760fc Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 14 May 2019 13:52:05 +0100 Subject: [PATCH 01/12] matrix-react-sdk v1.1.1 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 8f954f41..66d960fc 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "1.1.0", - "matrix-react-sdk": "1.1.0", + "matrix-react-sdk": "1.1.1", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index 8e64312e..6b1830b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5770,10 +5770,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.0.tgz#3f1c139cb4c33190b9dcb36a6e776d3ad53334f6" - integrity sha512-3JjyzbrmokzCl5Ss/0dWjUyc8EuO3uWvD3LBHZhTkFHe1uSiHjC2+Oy8hiJha8tubJtCWnQPE7tXIffkYmvdAQ== +matrix-react-sdk@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.1.tgz#7a6d22cb0fb5265de0ffef51f1c0a0c1427db67b" + integrity sha512-vVPy9ChMLlfdGRGmAgtwLtyfw/Gt/03E/1X9Y5jnHZ+inMZgJgY5RZkCzUdC3afQYtd3dimzqoaYLSa+HQ1RWw== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" From 875d1b209afe3f4fccffc38a89199792cd2e89f9 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 14 May 2019 13:53:31 +0100 Subject: [PATCH 02/12] v1.1.1 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index e4c024bb..37a0eca8 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.1.0", + "version": "1.1.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From e4ed0994ce730d8b18ca30c367ca46851bff388d Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 14 May 2019 14:01:01 +0100 Subject: [PATCH 03/12] Prepare changelog for v1.1.1 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ad30289..6ed0e265 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1) + + * react-sdk v1.1.1 to fix regressions with registration + Changes in [1.1.0](https://github.com/vector-im/riot-web/releases/tag/v1.1.0) (2019-05-07) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0-rc.1...v1.1.0) From 5aa8326dfc220f92d7a0114a39110af5cc4851d8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 14 May 2019 14:01:01 +0100 Subject: [PATCH 04/12] v1.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 66d960fc..f61278fc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.1.0", + "version": "1.1.1", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From f5e7dd5164947aeb29db51b2e5142f284aef9d66 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 15 May 2019 10:00:47 +0100 Subject: [PATCH 05/12] add description of new labs feature for message editing --- docs/labs.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/labs.md b/docs/labs.md index 65b71b34..3d568a2b 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -35,4 +35,11 @@ That's it. Now should see your new counter under the header. reactions from other people. This feature is currently under active development, and only portions have been implemented so far. +## Message editing + +`feature_message_editing` allows editing messages after they have been sent, +accessible from the reaction/context bar when hovering a message. +This feature is currently under active development, +and only portions have been implemented so far. + [#riot-web:matrix.org]: https://matrix.to/#/#riot-web:matrix.org From 5a6be9a665b785cd651540b0abd138760ad3bc96 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 15 May 2019 11:12:12 +0100 Subject: [PATCH 06/12] Add message editing to sample also --- config.sample.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.sample.json b/config.sample.json index c1aedee0..c80c46fb 100644 --- a/config.sample.json +++ b/config.sample.json @@ -13,7 +13,8 @@ "features": { "feature_groups": "labs", "feature_pinning": "labs", - "feature_reactions": "labs" + "feature_reactions": "labs", + "feature_message_editing": "labs" }, "default_federate": true, "default_theme": "light", From d0def4a80f286ce63fb321c826c8ade37c21b332 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 15 May 2019 14:34:13 +0100 Subject: [PATCH 07/12] react-sdk 1.1.2 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index f61278fc..066bdb36 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "gfm.css": "^1.1.2", "highlight.js": "^9.13.1", "matrix-js-sdk": "1.1.0", - "matrix-react-sdk": "1.1.1", + "matrix-react-sdk": "1.1.2", "modernizr": "^3.6.0", "olm": "https://packages.matrix.org/npm/olm/olm-3.1.0.tgz", "prop-types": "^15.6.2", diff --git a/yarn.lock b/yarn.lock index 6b1830b7..fba1c939 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5770,10 +5770,10 @@ matrix-mock-request@^1.2.3: bluebird "^3.5.0" expect "^1.20.2" -matrix-react-sdk@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.1.tgz#7a6d22cb0fb5265de0ffef51f1c0a0c1427db67b" - integrity sha512-vVPy9ChMLlfdGRGmAgtwLtyfw/Gt/03E/1X9Y5jnHZ+inMZgJgY5RZkCzUdC3afQYtd3dimzqoaYLSa+HQ1RWw== +matrix-react-sdk@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-1.1.2.tgz#bff86db4fc521deb3076467707dcc338bbff0542" + integrity sha512-MKALTgxSULFSJZagts9+oMu/SZFNHHfZcMKgDWJELdgTIcHUg/rIOFt2y1ghkbpWJjC2wGM8J5E0TAsL0aeWcQ== dependencies: babel-plugin-syntax-dynamic-import "^6.18.0" babel-runtime "^6.26.0" From 8ac59571861d4ce92fea1795752bda20d12466c6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 15 May 2019 14:34:59 +0100 Subject: [PATCH 08/12] v1.1.2 --- electron_app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron_app/package.json b/electron_app/package.json index 37a0eca8..ad426ee1 100644 --- a/electron_app/package.json +++ b/electron_app/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.1.1", + "version": "1.1.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { From e7494201964da83dc0306028acdb162c80baf3f6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 15 May 2019 14:36:51 +0100 Subject: [PATCH 09/12] Prepare changelog for v1.1.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ed0e265..90bd05d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Changes in [1.1.2](https://github.com/vector-im/riot-web/releases/tag/v1.1.2) (2019-05-15) +========================================================================================== +[Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.1...v1.1.2) + + * react-sdk v1.1.2 to fix single sign-on and GIF autoplaying + Changes in [1.1.1](https://github.com/vector-im/riot-web/releases/tag/v1.1.1) (2019-05-14) ========================================================================================== [Full Changelog](https://github.com/vector-im/riot-web/compare/v1.1.0...v1.1.1) From 5aa88abacc0d42adbaba842873bcb989c7fbb0da Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 15 May 2019 14:36:52 +0100 Subject: [PATCH 10/12] v1.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 066bdb36..15d60ffe 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "electron_app/src/electron-main.js", - "version": "1.1.1", + "version": "1.1.2", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { From 3123b429f788a0b0597fc20081c2b523c192e8d1 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Wed, 15 May 2019 15:12:33 -0600 Subject: [PATCH 11/12] Increase timeout for yarn install in Docker builds Otherwise we run into problems where Docker Hub's limited machines timeout trying to download our dependencies --- Dockerfile | 2 +- scripts/docker-link-repos.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 79ee1f68..e601595c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ WORKDIR /src COPY . /src RUN dos2unix /src/scripts/docker-link-repos.sh && sh /src/scripts/docker-link-repos.sh -RUN yarn install +RUN yarn --network-timeout=100000 install RUN yarn build # Copy the config now so that we don't create another layer in the app image diff --git a/scripts/docker-link-repos.sh b/scripts/docker-link-repos.sh index 816b2e04..9f17188e 100644 --- a/scripts/docker-link-repos.sh +++ b/scripts/docker-link-repos.sh @@ -13,7 +13,7 @@ git clone $JS_SDK_REPO js-sdk cd js-sdk git checkout $JS_SDK_BRANCH yarn link -yarn install +yarn --network-timeout=100000 install cd ../ echo "Linking react-sdk" @@ -22,7 +22,7 @@ cd react-sdk git checkout $REACT_SDK_BRANCH yarn link yarn link matrix-js-sdk -yarn install +yarn --network-timeout=100000 install cd ../ echo "Setting up riot-web with react-sdk and js-sdk packages" From 45e8c26864433864891dc61915219c402a7ecc6c Mon Sep 17 00:00:00 2001 From: Tom Lant Date: Thu, 16 May 2019 11:24:45 +0100 Subject: [PATCH 12/12] Update issue templates --- .../ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md index df9cfe4f..ffb8971b 100644 --- a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md +++ b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md @@ -2,7 +2,7 @@ name: User Interface or Usability Bug report about: Please include screenshots in UI/UX bug reports title: '' -labels: '' +labels: bug, ui/ux assignees: '' ---