From ff0254d3463ffb6fc4263b05525011a8c42d8382 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 14 May 2018 17:36:57 +0100 Subject: [PATCH 1/3] Fix ContextualMenu imports for TagTile and code block copy button --- src/components/views/elements/TagTile.js | 2 +- src/components/views/messages/TextualBody.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/views/elements/TagTile.js b/src/components/views/elements/TagTile.js index c5fdea0a54..fb3ddee093 100644 --- a/src/components/views/elements/TagTile.js +++ b/src/components/views/elements/TagTile.js @@ -21,7 +21,7 @@ import { MatrixClient } from 'matrix-js-sdk'; import sdk from '../../../index'; import dis from '../../../dispatcher'; import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard'; -import ContextualMenu from '../../structures/ContextualMenu'; +import * as ContextualMenu from '../../structures/ContextualMenu'; import FlairStore from '../../../stores/FlairStore'; import GroupStore from '../../../stores/GroupStore'; diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js index a4a4b4ebe8..bc2a715d31 100644 --- a/src/components/views/messages/TextualBody.js +++ b/src/components/views/messages/TextualBody.js @@ -32,7 +32,7 @@ import SdkConfig from '../../../SdkConfig'; import dis from '../../../dispatcher'; import { _t } from '../../../languageHandler'; import MatrixClientPeg from '../../../MatrixClientPeg'; -import ContextualMenu from '../../structures/ContextualMenu'; +import * as ContextualMenu from '../../structures/ContextualMenu'; import SettingsStore from "../../../settings/SettingsStore"; import PushProcessor from 'matrix-js-sdk/lib/pushprocessor'; import ReplyThread from "../elements/ReplyThread"; From aaffe2a3e1fec8305e890eb9acda599eaabb184b Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 14 May 2018 18:23:14 +0100 Subject: [PATCH 2/3] Prepare changelog for v0.12.4-rc.4 --- CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89f3741535..54664ac124 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,44 @@ +Changes in [0.12.4-rc.4](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.4-rc.4) (2018-05-14) +=============================================================================================================== +[Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.3...v0.12.4-rc.4) + + * Update from Weblate. + [\#1904](https://github.com/matrix-org/matrix-react-sdk/pull/1904) + * Correctly identify sticker picker widgets + [\#1894](https://github.com/matrix-org/matrix-react-sdk/pull/1894) + * Quick fix for sticker picker position + [\#1903](https://github.com/matrix-org/matrix-react-sdk/pull/1903) + * Remove redundant logging (currently shown on every render when no sti… + [\#1901](https://github.com/matrix-org/matrix-react-sdk/pull/1901) + * Fix stickers briefly being 2x the size + [\#1899](https://github.com/matrix-org/matrix-react-sdk/pull/1899) + * Send required properties when making requests to widgets over postMessage + [\#1891](https://github.com/matrix-org/matrix-react-sdk/pull/1891) + * Fix room widget second load infini spinner + [\#1897](https://github.com/matrix-org/matrix-react-sdk/pull/1897) + * Update widget state when account data changes + [\#1896](https://github.com/matrix-org/matrix-react-sdk/pull/1896) + * Remove margins when in a ReplyThread to stop them taking so much space + [\#1882](https://github.com/matrix-org/matrix-react-sdk/pull/1882) + * Add setting to enable widget screenshots (if widgets declare support) + [\#1892](https://github.com/matrix-org/matrix-react-sdk/pull/1892) + * T3chguy/replies html tag + [\#1889](https://github.com/matrix-org/matrix-react-sdk/pull/1889) + * Instant Sticker Picker + [\#1888](https://github.com/matrix-org/matrix-react-sdk/pull/1888) + * Update widget 'widgetData' key to 'data' to match spec. + [\#1887](https://github.com/matrix-org/matrix-react-sdk/pull/1887) + * Fix 'state_key' field name. + [\#1886](https://github.com/matrix-org/matrix-react-sdk/pull/1886) + * Improve appearance of short-lived app loading spinner + [\#1885](https://github.com/matrix-org/matrix-react-sdk/pull/1885) + * Take feature_sticker_messagse out of labs + [\#1883](https://github.com/matrix-org/matrix-react-sdk/pull/1883) + * Fix issue incorrect positioning with widget loading indicator + [\#1884](https://github.com/matrix-org/matrix-react-sdk/pull/1884) + * Users should always be able to edit their user/non-room widgets + [\#1879](https://github.com/matrix-org/matrix-react-sdk/pull/1879) + Changes in [0.12.4-rc.3](https://github.com/matrix-org/matrix-react-sdk/releases/tag/v0.12.4-rc.3) (2018-05-11) =============================================================================================================== [Full Changelog](https://github.com/matrix-org/matrix-react-sdk/compare/v0.12.4-rc.2...v0.12.4-rc.3) From 7bfc50bf429dbe5c1046209306cc12e09b23a38c Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Mon, 14 May 2018 18:23:14 +0100 Subject: [PATCH 3/3] v0.12.4-rc.4 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1125dd3980..77ba18ba04 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "matrix-react-sdk", - "version": "0.12.4-rc.3", + "version": "0.12.4-rc.4", "description": "SDK for matrix.org using React", "author": "matrix.org", "repository": {