David Baker
f0ad70f0e7
Merge pull request #5786 from DantrazTrev/DialPad
...
Dial Pad UI bug fixes
2021-06-23 11:41:41 +01:00
Michael Telatynski
1fe1288427
Merge pull request #6247 from SimonBrandner/feature/media-device-handler
2021-06-23 11:10:09 +01:00
Šimon Brandner
4ab9758b67
log -> warn
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:43:49 +02:00
Šimon Brandner
0e582c425c
Make this look nicer
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-23 10:42:19 +02:00
Šimon Brandner
1bef985d46
Remove emmiting that isn't useful for us now
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:39:10 +02:00
Šimon Brandner
95624b3fa6
Add some docs
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:37:15 +02:00
Šimon Brandner
6c9e0e54e9
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:27:51 +02:00
Šimon Brandner
58151d71c5
Handle mid-call output changes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 10:09:53 +02:00
Germain
35b8f79fbd
Merge pull request #6228 from matrix-org/gsouquet/fix-17673
2021-06-23 09:08:43 +01:00
Šimon Brandner
9bceb40820
CallMediaHandler -> MediaDeviceHandler
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-23 09:26:33 +02:00
Jaiwanth
5fff64f128
Fix types
2021-06-23 12:14:20 +05:30
Jaiwanth
b2162c3be9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-23 12:09:46 +05:30
Jaiwanth
438b9d4730
Get rid of jszip and replace it with a custom library
2021-06-23 11:58:50 +05:30
Travis Ralston
759a4e796f
Merge pull request #6234 from SimonBrandner/fix/room-dir-click/13751
...
Improve room directory click behaviour
2021-06-22 19:44:20 -06:00
Michael Telatynski
d5581f00cc
Merge pull request #6239 from matrix-org/t3chguy/fix/17605
2021-06-22 22:56:49 +01:00
Michael Telatynski
50a5c03730
Merge pull request #6151 from matrix-org/t3chguy/fix/17244
2021-06-22 22:52:33 +01:00
Michael Telatynski
9f20d6661d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17605
...
Conflicts:
src/components/views/spaces/SpaceTreeLevel.tsx
2021-06-22 22:49:28 +01:00
Michael Telatynski
e4542e13d9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
2021-06-22 22:42:59 +01:00
Michael Telatynski
24b03366a8
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17368
2021-06-22 22:40:59 +01:00
Michael Telatynski
bbdc28f56d
Merge pull request #6241 from matrix-org/t3chguy/ts/7
2021-06-22 22:34:15 +01:00
Michael Telatynski
ffaa19ef2c
fix typing
2021-06-22 22:27:12 +01:00
Michael Telatynski
e0ac200e27
Iterate PR
2021-06-22 22:23:09 +01:00
Michael Telatynski
83296b7440
Fix typing
2021-06-22 22:19:01 +01:00
Michael Telatynski
9dc8493a5c
Hide communities invites and the community autocompleter when Spaces Beta is enabled
2021-06-22 22:07:42 +01:00
Michael Telatynski
1286be1ffb
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244
...
Conflicts:
src/components/views/room_settings/AliasSettings.tsx
2021-06-22 22:02:09 +01:00
Michael Telatynski
5dc542f189
Iterate PR
2021-06-22 22:01:18 +01:00
Travis Ralston
c316eb841a
Merge pull request #6179 from aaronraimist/open-local-addresses
...
Open local addresses section by default when there are no existing local addresses
2021-06-22 14:48:02 -06:00
Michael Telatynski
49d20d2530
consolidate the two onRoomAccountData listeners
2021-06-22 21:22:30 +01:00
Michael Telatynski
99e3aea1e5
i18n and regen yarn lock
2021-06-22 21:17:33 +01:00
Michael Telatynski
6e3c647109
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17282
...
Conflicts:
package.json
src/components/views/spaces/SpacePanel.tsx
src/i18n/strings/en_EN.json
src/stores/SpaceStore.tsx
yarn.lock
2021-06-22 21:15:53 +01:00
Michael Telatynski
7948aa6181
Iterate PR, improve jsdoc and switch function style
2021-06-22 21:10:29 +01:00
Travis Ralston
1180741cc2
Merge pull request #6000 from robintown/event-tile-preview-fixes
...
EventTilePreview fixes
2021-06-22 13:57:07 -06:00
Michael Telatynski
6fd1dc7d18
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/7
2021-06-22 18:09:24 +01:00
Michael Telatynski
cd04fb76dc
Fix type error
2021-06-22 18:01:29 +01:00
Michael Telatynski
59052b1eb7
Merge pull request #6199 from matrix-org/t3chguy/fix/17665
2021-06-22 17:46:57 +01:00
Michael Telatynski
e3e6b74272
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
...
Conflicts:
src/stores/SpaceStore.tsx
2021-06-22 17:38:05 +01:00
Michael Telatynski
59258585b3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-22 17:28:19 +01:00
Michael Telatynski
4a66794236
update copy
2021-06-22 17:26:19 +01:00
Michael Telatynski
a839d0f396
More typescript conversion
2021-06-22 17:23:13 +01:00
Michael Telatynski
6d92953311
Convert bunch of utils to TS
2021-06-22 17:22:38 +01:00
Michael Telatynski
3c9cd938d0
remove spurious full stop
2021-06-22 15:29:53 +01:00
Germain
5b72423ea3
Merge pull request #6230 from matrix-org/gsouquet/fix-17051
2021-06-22 15:07:04 +01:00
Germain
ded738ce8c
Add spaces around curlies
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 14:57:44 +01:00
Michael Telatynski
847e3dcbce
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
...
Conflicts:
src/dispatcher/actions.ts
2021-06-22 14:11:37 +01:00
Michael Telatynski
1f0fdb95cd
Improve accessibility of subspaces in the space panel
2021-06-22 11:59:04 +01:00
Michael Telatynski
66b3feb802
Fix keyboard accessibility of the space panel
2021-06-22 11:50:00 +01:00
Germain Souquet
dd58c9f413
Add TruncatedList in AddExistingToSpaceDialog
2021-06-22 10:52:33 +01:00
Germain
f56216eec5
Merge pull request #6238 from matrix-org/gsouquet/fix-17716
...
Fix modal opening race condition
2021-06-22 10:28:30 +01:00
Germain
9dee75a7b1
Merge pull request #6229 from matrix-org/gsouquet/fix-17678
2021-06-22 10:27:50 +01:00
Germain Souquet
3d3c428455
Fix DesktopBuildsNotice return type
2021-06-22 10:26:49 +01:00
Jaiwanth
36a69313cd
Display redactedBecauseUserId for redacted events
2021-06-22 14:53:48 +05:30
Germain Souquet
db9ffe9b3e
Fix AccessibleButton label for VerificationRequest
2021-06-22 10:18:09 +01:00
Germain
e9d87478e2
Spaces before/after curlies
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-06-22 10:06:31 +01:00
Germain Souquet
3c72569270
Fix modal opening race condition
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
React 17 is hitting a race condition when a modal is closing and is trying to open another one within the same tick.
A proper long term fix would be using React.createPortal to avoid manually mounting and unmounting new React roots
2021-06-22 09:53:58 +01:00
Šimon Brandner
066ef18db2
Replace onClick by onMouseDown
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:24:42 +02:00
Jaiwanth
db875508d8
Add text for room avatar events and skip empty text events
2021-06-22 12:50:15 +05:30
Šimon Brandner
a59deeb491
Add onClick handlers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:16:45 +02:00
Šimon Brandner
de40657194
Don't show room if we don't click on buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-22 09:12:41 +02:00
Jaiwanth
12ecaf30df
i18n
2021-06-22 12:14:31 +05:30
Jaiwanth
8a1cd77ef4
Handle no match cases and modify textForEvent to handle redacted messages
2021-06-22 12:12:37 +05:30
Jaiwanth
c58abd9582
Revert auto format
2021-06-22 10:51:16 +05:30
Jaiwanth
bf189204f2
Implement IRC bridge style reply formatting
2021-06-22 10:49:14 +05:30
Jaiwanth
0cbcc5a5fd
Merge branch 'export-conversations' of github.com:jaiwanth-v/matrix-react-sdk into export-conversations
2021-06-22 09:29:24 +05:30
Jaiwanth
a0e0453635
Fix type lint
2021-06-22 09:27:49 +05:30
Jaiwanth
45be4a6d02
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-22 09:27:37 +05:30
Michael Telatynski
dda4c8ec4c
Move Promise::allSettled typing from react-sdk to js-sdk
2021-06-21 21:04:29 +01:00
Michael Telatynski
0e4bac46f8
Merge pull request #6222 from SimonBrandner/fix/prioritise-canonical/17570
2021-06-21 20:57:24 +01:00
Michael Telatynski
845bb95887
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/5
2021-06-21 20:46:28 +01:00
Michael Telatynski
6b16b9aca6
Merge pull request #6232 from SimonBrandner/fix/quote/17715
...
Fix quote button
2021-06-21 20:29:54 +01:00
Šimon Brandner
903f898bee
Remove ComposerInsertPayload as this is a JS file
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-21 18:28:30 +02:00
Germain Souquet
88d25ad6af
Fix typo in default import name
2021-06-21 15:44:09 +01:00
Germain Souquet
7825c30bf7
Improve event index initialisation failure message in search bar for supported platforms
2021-06-21 15:41:47 +01:00
Germain Souquet
7f635c68c5
Migrate SearchBar to TypeScript
2021-06-21 14:50:21 +01:00
Germain Souquet
adb42b7927
Deprecate FormButton to use AccessibleButton everywhere
2021-06-21 14:16:37 +01:00
Germain Souquet
ca123d3c4d
Migrate MKeyVerificationRequest to TypeScript
2021-06-21 14:05:56 +01:00
Germain Souquet
d2595dcd61
use TruncatedList to improve ForwardDialog rendering time
2021-06-21 12:29:59 +01:00
Germain Souquet
9756a99220
Migrate TruncatedList to TypeScript
2021-06-21 12:14:30 +01:00
Michael Telatynski
e79b7d7adb
Fix View Source accessing renamed private field on MatrixEvent
2021-06-21 09:45:22 +01:00
Michael Telatynski
b380e43e4f
Merge pull request #6219 from matrix-org/t3chguy/ts/6
...
Fix ConfirmUserActionDialog returning an input field rather than text
2021-06-21 08:53:43 +01:00
Jaiwanth
44f458d577
Modify local avatar's url to not contain colons
2021-06-21 11:43:47 +05:30
Šimon Brandner
7bf230e665
Prefer canonical aliases over non-canonical ones
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-20 11:17:42 +02:00
Šimon Brandner
d0ea842f1e
Remove sorting by index as it is already done here: e9ea3cad76/src/autocomplete/QueryMatcher.ts (L120)
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-20 10:29:08 +02:00
Travis Ralston
9344adb2d2
Revert "Partially restore immutable event objects at the rendering layer"
2021-06-19 13:38:19 -06:00
Michael Telatynski
8e2a7cc3f6
Convert crypto index to TS
2021-06-19 19:41:45 +01:00
Michael Telatynski
2c5ddea1d9
Fix ConfirmUserActionDialog returning an input field rather than text
2021-06-19 15:57:07 +01:00
Michael Telatynski
a2a5158411
Fix View Source accessing renamed private field on MatrixEvent
2021-06-19 15:37:48 +01:00
Michael Telatynski
be10e77704
Improve typing of Event Index Manager / Seshat
2021-06-19 15:37:06 +01:00
Travis Ralston
273fb75fc9
Merge branch 'develop' into travis/event-fixes
2021-06-18 11:26:51 -06:00
David Teller
77a4d345bd
Submitting abuse reports to moderators ( #6213 )
...
This patch is part of MSC3215. It implements `feature_report_to_moderator`
to let end-users send report to room moderators instead of homeserver
administrators.
This only works if the room has been setup for moderation, something that
does not have a UX yet.
Signed-off-by: David Teller <davidt@element.io>
2021-06-18 18:09:02 +02:00
Michael Telatynski
ab94b284b8
Updates around the use of private fields out of class
2021-06-18 16:29:10 +01:00
Travis Ralston
bc74a7366b
Merge pull request #6197 from matrix-org/travis/voice-messages/fix-msc-number
...
Update MSC number references for voice messages
2021-06-18 09:23:28 -06:00
Michael Telatynski
233e2aa425
Fix bugs identified by the typescripting
2021-06-18 16:22:31 +01:00
Michael Telatynski
0ae4e7b11d
Fix typescript types
2021-06-18 16:21:46 +01:00
Michael Telatynski
3b7c92fd9e
Use new js-sdk types properly
2021-06-18 16:18:42 +01:00
Michael Telatynski
058cbbbd0c
Fix imports
2021-06-18 16:13:55 +01:00
Michael Telatynski
9cce5ef10f
Consolidate types with js-sdk changes
2021-06-18 15:31:12 +01:00
J. Ryan Stinnett
538165d515
Fix phase enum usage in JS modules as well
...
https://github.com/matrix-org/matrix-react-sdk/pull/6185 converted
`SetupEncryptionStore` to TS, including moving the phase states to an enum. The
calling JS modules were forgotten, so they got a bit confused.
Fixes https://github.com/vector-im/element-web/issues/17689
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6185
2021-06-18 14:05:12 +01:00
Germain Souquet
fcda0604e0
Fix RoomMember import
2021-06-18 12:48:31 +01:00
Germain Souquet
d22617c422
More specific type definition and adhering to code style better
2021-06-18 12:44:15 +01:00
Germain Souquet
3f1ca970d6
Merge branch 'develop' into gsouquet/dialogs-ts-migration
2021-06-18 12:27:00 +01:00
Michael Telatynski
dddc32d870
Merge pull request #6208 from matrix-org/t3chguy/ts/5
2021-06-18 09:49:03 +01:00
Michael Telatynski
d9caa3533b
Merge pull request #5858 from matrix-org/t3chguy/fix/12740
2021-06-18 08:22:21 +01:00
Travis Ralston
98e0200b4a
Function name
2021-06-17 14:21:50 -06:00
Travis Ralston
a687391b98
Switch order
2021-06-17 14:21:01 -06:00
Germain
71ff5248fe
Merge pull request #6082 from SimonBrandner/fix/mute-incoming-call/15591
2021-06-17 16:41:00 +01:00
Michael Telatynski
7d90612371
Iterate PR
2021-06-17 16:22:40 +01:00
Michael Telatynski
35e68b8aa5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17665
2021-06-17 15:45:32 +01:00
Michael Telatynski
f38cd38bd3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/12740
...
Conflicts:
src/components/structures/TimelinePanel.js
src/components/views/context_menus/MessageContextMenu.js
src/components/views/right_panel/UserInfo.tsx
src/dispatcher/actions.ts
2021-06-17 15:31:06 +01:00
Michael Telatynski
2e73647a85
Fix tests by updating private field names and spies
2021-06-17 15:18:52 +01:00
Michael Telatynski
3e38d92fa4
Fix up some more type defs
2021-06-17 14:49:27 +01:00
Michael Telatynski
02e72d8b04
Fix more type definitions
2021-06-17 14:24:53 +01:00
Michael Telatynski
f929d2ee5f
Typescript fixes due to MatrixEvent being TSified
2021-06-17 14:06:03 +01:00
Michael Telatynski
cce4ccb157
Fix types in SlashCommands which assumed something was a promise but it wasn't
2021-06-17 11:37:06 +01:00
Germain
782adbc41e
Merge pull request #6190 from matrix-org/gsouquet/performance-tracking-markers
2021-06-17 10:27:33 +01:00
J. Ryan Stinnett
6e827ad4c9
Merge pull request #6204 from robintown/forward-dialog-display-name
...
Fix forward dialog message preview display names
2021-06-17 10:10:54 +01:00
Germain Souquet
1a08af8ccf
remove stray bullet point in reply preview
2021-06-17 08:45:09 +01:00
Jaiwanth
9e6b8ff9f5
Start implementation of plain text export
2021-06-17 10:46:08 +05:30
Robin Townsend
2750d64495
Merge branch 'develop' into event-tile-preview-fixes
2021-06-16 18:27:10 -04:00
Robin Townsend
79bf7bee56
Fix EventTilePreview display names
...
Because of 91df392a2a
, we now need to
additionally set rawDisplayName to properly fake our display name for an
event.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 18:23:44 -04:00
Robin Townsend
ce57b66c91
Fix forward dialog message preview display names
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-16 18:17:25 -04:00
Michael Telatynski
100de336a1
i18n
2021-06-16 20:12:31 +01:00
J. Ryan Stinnett
8f02ca8ce9
Stop requesting null next replies from the server
...
A recent change (47e007e08f
) introduced a
regression where we failed to check whether a reply thread has a next reply.
This meant that we would end up sending `/context/undefined` requests to the
server for every reply thread on every room view.
Fixes https://github.com/vector-im/element-web/issues/17563
Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/6079
2021-06-16 18:04:41 +01:00
Michael Telatynski
ccf30ed94c
Merge pull request #6202 from matrix-org/t3chguy/fix/17669
2021-06-16 12:46:44 +01:00
Michael Telatynski
ab964339d2
Add another setState skip to prevent redundant state updates
2021-06-16 12:11:17 +01:00
Michael Telatynski
626d575820
tidy AuxPanel TS
2021-06-16 12:07:58 +01:00
Michael Telatynski
d87325ae6a
Small cleanup around the room status bar and auxpanel to prevent redundant state updates
2021-06-16 12:06:41 +01:00
Michael Telatynski
e3a6ce13cd
Fix tight-loop update issue caused by a broken shouldComponentUpdate
2021-06-16 12:04:37 +01:00
Michael Telatynski
deb2e8d679
Remove unused methods
2021-06-16 12:04:01 +01:00
Michael Telatynski
590ce56740
Use MultiInviter error messages in InviteDialog for room invites
2021-06-16 11:48:14 +01:00
Michael Telatynski
47ddd33d21
Remove explicit .js
imports
2021-06-16 10:24:51 +01:00
Michael Telatynski
27e27b7a87
Convert MultiInviter, RoomInvite and UserAddress to Typescript
2021-06-16 10:18:32 +01:00
Germain Souquet
069e2e13cf
Migrate MessageTimestamp to TypeScript
2021-06-16 10:01:30 +01:00
Germain Souquet
a5d608f2af
Keep composer reply when scrolling away from a highlighted event
2021-06-16 10:01:23 +01:00
Michael Telatynski
d4e376201f
Break down the SpacePanel component
2021-06-16 09:44:37 +01:00
Michael Telatynski
cee294f5a7
iterate PR
2021-06-16 09:23:06 +01:00
Michael Telatynski
a75fb98fbc
Fix some NPEs
2021-06-16 09:07:55 +01:00
Michael Telatynski
b4fbc791bb
Add experimental options to the Spaces beta
2021-06-16 09:01:13 +01:00
Jaiwanth
cff4521106
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-16 10:52:00 +05:30
Travis Ralston
d13611736a
Update MSC number references for voice messages
...
as per https://github.com/matrix-org/matrix-doc/pull/3245
2021-06-15 17:24:56 -06:00
Travis Ralston
ea46df0d48
Partially restore immutable event objects at the rendering layer
...
This is primarily to fix some extremely rare edge cases in local echo, but also restores the accuracy of some comments in the stack regarding immutable event objects (which were made mutable many years ago).
This shouldn't have any impact on the daily usage of the app, only adding a measured 0ms of latency to the stack.
2021-06-15 14:23:19 -06:00
David Baker
38c5972d3e
Merge remote-tracking branch 'origin/develop' into dbkr/already_in_call
2021-06-15 19:20:29 +01:00
David Baker
f1cd086ae2
Cache virtual/native room mappings when they're created
...
Otherwise we look up the mapping immediately afterwards and the
remote echo of the account data hasn't come back yet, so we get
nothing.
Fixes "You're already in a call with this person" bug with virtual
rooms.
2021-06-15 16:27:18 +01:00
Weblate
12f8e5b278
Merge branch 'origin/develop' into Weblate.
2021-06-15 14:40:39 +00:00
Besnik Bleta
6d56c9eab4
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2972 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/sq/
2021-06-15 14:40:33 +00:00
m4sk1n
24bdcf48a9
Translated using Weblate (Polish)
...
Currently translated at 73.2% (2181 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pl/
2021-06-15 14:40:31 +00:00
Victor Grousset
6adbc90127
Translated using Weblate (Esperanto)
...
Currently translated at 99.9% (2978 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/eo/
2021-06-15 14:40:17 +00:00
lvre
5509fe455e
Translated using Weblate (Portuguese (Brazil))
...
Currently translated at 94.0% (2803 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/pt_BR/
2021-06-15 14:40:16 +00:00
Balázs Meskó
7bc305f0d4
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2979 of 2979 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-06-15 14:40:13 +00:00
Germain Souquet
19cae42161
Benchmark multiple common user scenario
2021-06-15 15:06:00 +01:00
Michael Telatynski
89221bde0f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17128-1
...
Conflicts:
src/dispatcher/actions.ts
2021-06-15 13:58:13 +01:00