Michael Telatynski
207a1143fc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
2021-09-28 15:45:09 +01:00
Germain
ca3b8e596a
Merge pull request #6873 from matrix-org/gsouquet/threads-action-bar-19127
2021-09-28 15:07:36 +01:00
Dariusz Niemczyk
8331d4c7b7
Happily handle empty text messages ( #6825 )
...
This commig refactors the message-deletion modal and reuses it for case of removing
the entire message and trying to send it, which should trigger removal flow instead.
Fix vector-im/element-web#18873
2021-09-28 15:04:25 +01:00
Germain Souquet
c1165830ed
Create rendering context enum for MessageActionBar
2021-09-28 14:55:00 +01:00
Michael Telatynski
540593e75d
Merge pull request #6874 from matrix-org/t3chguy/spaces-null-guard-client
2021-09-28 13:55:39 +01:00
Germain Souquet
160bf8e21f
Fix missing prop
2021-09-28 11:06:06 +01:00
Michael Telatynski
d71f2345fb
Null guard around the matrixClient in SpaceStore
2021-09-28 10:34:32 +01:00
Germain Souquet
e52a33e93c
Merge branch 'develop' into gsouquet/threads-action-bar-19127
2021-09-28 09:34:43 +01:00
Travis Ralston
8e497f8c56
Merge pull request #6871 from psrpinto/fix/close-url-preview-button
...
Fix issue with preview panel close button not appearing for certain messages containing a URL
2021-09-27 13:42:11 -06:00
Paulo Pinto
432dd994bd
Filter out invalid previews
...
The call to cli.getUrlPreview() might return an empty object ({}), which means
there is in fact no preview for that URL.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-09-27 18:07:54 +01:00
Paulo Pinto
dabc13c98f
Extract logic to a function
...
For better readability of the call to useAsyncMemo()
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-09-27 18:07:54 +01:00
Travis Ralston
77ad0a9142
Merge pull request #6699 from SimonBrandner/fix/improve-aux-panel/18787
...
Improve AUX panel behaviour
2021-09-27 10:16:05 -06:00
Michael Telatynski
c39519a753
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/spaces-admin-check
2021-09-27 13:46:51 +01:00
Dariusz Niemczyk
0cfa2a58c7
Add ability to expand and collapse long quoted messages ( #6701 )
...
In case where we had a very long message the experience of going between
messages to see the full quote isn't very nice on desktop, therefore this commit
adds a button with additional hotkey to normalize the experience a bit.
Fixes https://github.com/vector-im/element-web/issues/18884
2021-09-27 12:20:37 +02:00
Michael Telatynski
6d0af83df4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18969
...
Conflicts:
src/components/views/dialogs/LeaveSpaceDialog.tsx
src/i18n/strings/en_EN.json
2021-09-27 11:19:49 +01:00
Šimon Brandner
0cba943f96
Fix types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 10:35:33 +02:00
Šimon Brandner
6a88ac900c
Merge remote-tracking branch 'upstream/develop' into task/messages-ts
2021-09-27 10:32:25 +02:00
Šimon Brandner
2712dde581
Remove empty line
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 10:28:07 +02:00
Germain
4fa4ff23c3
Merge pull request #6863 from SimonBrandner/task/utils-ts
2021-09-27 09:26:04 +01:00
Šimon Brandner
dd92f8f1f9
Move imports
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 10:21:46 +02:00
Šimon Brandner
1ed4a9eb4f
Fix JSDoc type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 10:19:53 +02:00
Šimon Brandner
a1d5e7ba66
Add return type
...
Co-authored-by: Germain <germain@souquet.com>
2021-09-27 10:12:55 +02:00
Šimon Brandner
6aa5d98741
Remove constructor
...
Co-authored-by: Germain <germain@souquet.com>
2021-09-27 10:12:45 +02:00
Šimon Brandner
b6fc10b65e
Merge remote-tracking branch 'upstream/develop' into task/rageshake-ts
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-27 09:56:09 +02:00
Šimon Brandner
af9429c8a0
Convert ActiveWidgetStore to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 19:57:02 +02:00
Šimon Brandner
2584b5bc6b
Convert rageshake to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 16:53:43 +02:00
Šimon Brandner
ee344efb3d
Convert MegolmExportEncryption to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 15:20:42 +02:00
Šimon Brandner
aa10cf45a5
Convert KeyVerificationStateObserver to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 15:05:51 +02:00
Šimon Brandner
0c6bf950f6
Convert HostingLink to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 15:03:50 +02:00
Šimon Brandner
755bfb4562
Convert DirectoryUtils to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 15:02:07 +02:00
Šimon Brandner
fb5c18caa0
Convert MKeyVerificationConclusion to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 14:51:46 +02:00
Šimon Brandner
c287d15fa0
Convert RoomCreate to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:42:29 +02:00
Šimon Brandner
421fa1ab69
Convert RoomAvatarEvent to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:42:28 +02:00
Šimon Brandner
ff1c1fbc78
Convert MjolnirBody to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:08:05 +02:00
Šimon Brandner
bee85a0bcd
Convert EditHistoryMessage to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-26 13:08:04 +02:00
Šimon Brandner
3450e91e32
Improve typing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-25 09:58:01 +02:00
Šimon Brandner
1a2476609c
Fix code to be equivalent to the previous one
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-25 07:55:40 +02:00
Šimon Brandner
27f74b3ebd
Remove unnecessary type
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-25 07:53:38 +02:00
Šimon Brandner
bffebb9304
Convert index to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-24 20:51:50 +02:00
Germain
79b52f8a22
Merge pull request #6857 from matrix-org/gsouquet/composer-reply-18989
2021-09-24 15:05:40 +01:00
David Baker
9f26cca256
Fix the User View
...
Extreme confusion between users and members, and presumably we were
passing one as the other and they were similar enough that it
worked.
UserView still makes fake member objects but this at least fixes
the user view in the right panel.
Fixes https://github.com/vector-im/element-web/issues/19158
2021-09-24 14:35:00 +01:00
Germain Souquet
8348add67f
Add MessageActionBar to ThreadView
2021-09-24 14:19:11 +01:00
Germain Souquet
836e427dc8
Scope editor reset when reply changed for thread view
2021-09-24 11:13:57 +01:00
Germain Souquet
82d685e410
Only switch to ThreadPanel when roomId changes
2021-09-24 11:06:07 +01:00
Germain Souquet
070f279ae7
Close thread view when changing room
2021-09-23 14:44:03 +01:00
Germain Souquet
bd599c96a3
Add React lifecycle methods publicity and return types
2021-09-23 14:43:39 +01:00
Germain Souquet
a9f7ab785c
Change CIDER state persistence key to cater for threads
...
Extending the CIDER state persistence to threads and make sure that SendMessageComposer can restore drafts for specific threads
This also prevents the thread's replyToEvent to leaking in the room composer
2021-09-23 10:59:33 +01:00
Germain
2cd5b731bf
Merge pull request #6851 from matrix-org/gsouquet/timeline-rendering-18719
2021-09-22 17:23:07 +01:00
Travis Ralston
7cd7cf87e3
Merge pull request #6853 from videogame-hacker/patch/undefined-3pids
...
Fix Notifications settings view when threepids is undefined
2021-09-22 10:22:58 -06:00
David Baker
f69854b274
Merge pull request #6856 from SimonBrandner/fix/soft-crash
...
Fix `AppsDrawer` soft crash
2021-09-22 14:56:00 +01:00