From 819fab319832ec1ac907e92e7b65b34a76db7e65 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 24 Oct 2018 11:20:39 +0100 Subject: [PATCH 1/7] js-sdk rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index dabaefe0ad..44d3b41ba6 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "linkifyjs": "^2.1.6", "lodash": "^4.13.1", "lolex": "2.3.2", - "matrix-js-sdk": "matrix-org/matrix-js-sdk#develop", + "matrix-js-sdk": "0.12.1-rc.1", "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", From 5f8eaa37821671fba1bcd6eff034753ea3e57cfc Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 24 Oct 2018 11:23:12 +0100 Subject: [PATCH 2/7] Prepare changelog for v0.14.2-rc.1 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00b035ac9c..b7e5ca7adf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,40 @@ +Changes in [0.14.2-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.2-rc.1) (2018-10-24) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.1...v0.14.2-rc.1) + + * Update from Weblate. + [\#2244](https://github.com/matrix-org/matrix-react-sdk/pull/2244) + * Show the group member list again + [\#2223](https://github.com/matrix-org/matrix-react-sdk/pull/2223) + * lint: make colorScheme camel case + [\#2237](https://github.com/matrix-org/matrix-react-sdk/pull/2237) + * Change leave room button text, OK -> Leave + [\#2236](https://github.com/matrix-org/matrix-react-sdk/pull/2236) + * Move all dialog buttons to the right and fix their order + [\#2231](https://github.com/matrix-org/matrix-react-sdk/pull/2231) + * Add a bit of text to explain the purpose of the RoomPreviewSpinner + [\#2225](https://github.com/matrix-org/matrix-react-sdk/pull/2225) + * Move the login box from the left sidebar to where the composer is + [\#2219](https://github.com/matrix-org/matrix-react-sdk/pull/2219) + * Fix an error where React doesn't like value=null on a select + [\#2230](https://github.com/matrix-org/matrix-react-sdk/pull/2230) + * add missing sticker translation + [\#2216](https://github.com/matrix-org/matrix-react-sdk/pull/2216) + * Support m.login.terms during registration + [\#2221](https://github.com/matrix-org/matrix-react-sdk/pull/2221) + * Don't show the invite nag bar when peeking + [\#2220](https://github.com/matrix-org/matrix-react-sdk/pull/2220) + * Apply the user's tint once the MatrixClientPeg is moderately ready + [\#2214](https://github.com/matrix-org/matrix-react-sdk/pull/2214) + * Make rageshake use less memory + [\#2217](https://github.com/matrix-org/matrix-react-sdk/pull/2217) + * Fix autocomplete + [\#2212](https://github.com/matrix-org/matrix-react-sdk/pull/2212) + * Explain feature states in a lot more detail + [\#2211](https://github.com/matrix-org/matrix-react-sdk/pull/2211) + * Fix various lint errors + [\#2213](https://github.com/matrix-org/matrix-react-sdk/pull/2213) + Changes in [0.14.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.1) (2018-10-19) ===================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.0...v0.14.1) From 43702a48875f184cd9e7b96da2a93e345e6bca43 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 24 Oct 2018 11:23:57 +0100 Subject: [PATCH 3/7] v0.14.2-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 44d3b41ba6..63f275a609 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.14.1", + "version": "0.14.2-rc.1", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": { From 9933a3cc63a887479176da7e9077cc0949f82bcd Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 26 Oct 2018 17:01:44 +0100 Subject: [PATCH 4/7] Fix autoreplacement of ascii emoji More slate API updates in code paths I didn't test Fixes https://github.com/vector-im/riot-web/issues/7509 --- src/components/views/rooms/MessageComposerInput.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js index 04f9299825..c92413f052 100644 --- a/src/components/views/rooms/MessageComposerInput.js +++ b/src/components/views/rooms/MessageComposerInput.js @@ -544,7 +544,7 @@ export default class MessageComposerInput extends React.Component { if (editorState.startText !== null) { const text = editorState.startText.text; - const currentStartOffset = editorState.startOffset; + const currentStartOffset = editorState.selection.start.offset; // Automatic replacement of plaintext emoji to Unicode emoji if (SettingsStore.getValue('MessageComposerInput.autoReplaceEmoji')) { @@ -558,11 +558,11 @@ export default class MessageComposerInput extends React.Component { const range = Range.create({ anchor: { - key: editorState.selection.startKey, + key: editorState.startText.key, offset: currentStartOffset - emojiMatch[1].length - 1, }, focus: { - key: editorState.selection.startKey, + key: editorState.startText.key, offset: currentStartOffset - 1, }, }); From eb22b9141ac3d6f3f6884334cef03fafa8e93f34 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 29 Oct 2018 14:03:19 +0000 Subject: [PATCH 5/7] released js-sdk --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 63f275a609..eb8f88ef22 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "linkifyjs": "^2.1.6", "lodash": "^4.13.1", "lolex": "2.3.2", - "matrix-js-sdk": "0.12.1-rc.1", + "matrix-js-sdk": "0.12.1", "optimist": "^0.6.1", "pako": "^1.0.5", "prop-types": "^15.5.8", From 2077678088576fea34b4bd8f007324435b285f65 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 29 Oct 2018 14:06:41 +0000 Subject: [PATCH 6/7] Prepare changelog for v0.14.2 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7e5ca7adf..dae09ee2f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +Changes in [0.14.2](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.2) (2018-10-29) +===================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.2-rc.1...v0.14.2) + + * Fix autoreplacement of ascii emoji + [\#2258](https://github.com/matrix-org/matrix-react-sdk/pull/2258) + Changes in [0.14.2-rc.1](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.14.2-rc.1) (2018-10-24) =============================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.14.1...v0.14.2-rc.1) From c5004ffbe3589756fcc575f35028397c1f4a7000 Mon Sep 17 00:00:00 2001 From: David Baker Date: Mon, 29 Oct 2018 14:07:03 +0000 Subject: [PATCH 7/7] v0.14.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index eb8f88ef22..7d5af70dc3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.14.2-rc.1", + "version": "0.14.2", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {