31e1831f02
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts
2021-09-17 18:25:14 +02:00
b91ece1bcf
Merge pull request #6828 from matrix-org/t3chguy/fix/a11y-label
2021-09-17 12:27:28 +01:00
8c08293654
Fix reactions aria-label not being a string and thus being read as [Object object]
2021-09-17 11:36:22 +01:00
af42a31794
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064
2021-09-17 10:22:57 +01:00
68768002bb
use more generic room type instead of boolean flag
2021-09-17 10:19:30 +01:00
80caa5646f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/npe1
2021-09-17 09:39:55 +01:00
58ffa5138b
Merge pull request #6822 from matrix-org/palid/thread-typescriptify
...
Transcriptify thread events a bit
2021-09-17 10:19:20 +02:00
0be6073058
Fix PR comments
2021-09-16 17:13:41 +02:00
d6788b023b
Fix PR comments
2021-09-16 16:04:18 +02:00
78587558d8
Transcriptify thread events a bit
2021-09-16 16:02:06 +02:00
1e91191fa2
Fix missing null guard in space hierarchy pagination
2021-09-16 14:28:55 +01:00
f7d8ae2b13
Fix invalid accessor for method.
2021-09-16 15:21:40 +02:00
1e04dfa11d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19064
2021-09-16 11:46:00 +01:00
ec4650c60d
Fix abuse of MainSplit in LegacyCommunityPreview
2021-09-16 11:23:41 +01:00
febd3df5ac
Fix MainSplit IProps
2021-09-16 11:22:55 +01:00
28bc8010a7
Say Joining space instead of Joining room where we know its a space
2021-09-16 11:20:01 +01:00
4bb9eeb7a5
Convert RoomPreviewBar to Typescript
2021-09-16 11:09:58 +01:00
fd24511d42
Merge pull request #6805 from matrix-org/t3chguy/fix/18858
2021-09-16 10:48:20 +01:00
3b39ba6590
Merge pull request #6787 from SimonBrandner/task/structures-ts
2021-09-16 10:45:12 +01:00
bbc8e4da23
Merge pull request #6594 from matrix-org/t3chguy/fix/18088
2021-09-16 10:16:33 +01:00
b052d0730d
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858
2021-09-16 10:15:43 +01:00
edf7764a3e
Merge pull request #6319 from SimonBrandner/fix/user-info-dm/17877
2021-09-16 10:09:22 +01:00
e17318a364
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-16 10:05:20 +01:00
a103a2ceaa
Revert "Show updated relation reply from edited message ( #6809 )"
...
This reverts commit eaab8e1570
2021-09-15 14:34:28 -06:00
eaab8e1570
Show updated relation reply from edited message ( #6809 )
...
Part of https://github.com/vector-im/element-web/issues/10391#issuecomment-906131724
When `m.relates_to` -> `m.in_reply_to` is provided in `m.new_content`
for an edited message, use the updated reply.
ex.
```json
{
"type": "m.room.message",
"content": {
"body": " * foo bar",
"msgtype": "m.text",
"m.new_content": {
"body": "foo bar",
"msgtype": "m.text",
"m.relates_to": {
"m.in_reply_to": {
"event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
}
}
},
"m.relates_to": {
"rel_type": "m.replace",
"event_id": "$lX9MRe9ZTFOOvnU8PRVbvr1wqGtYvNQ1rSot-iUTN5k"
}
}
}
```
2021-09-15 11:49:04 -05:00
4f53e6cddd
Merge remote-tracking branch 'origin/develop' into dbkr/fix_roomlist_prompt
2021-09-15 15:13:52 +01:00
0f98c9127d
Fix checks to show prompt to start new chats
...
We compared the length of the list rooms but not historical or favourite.
Caught by new version of typescript when I tried to upgrade.
2021-09-15 15:08:23 +01:00
a571460871
Use a universal copy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-15 15:30:23 +02:00
8094a34384
Merge remote-tracking branch 'upstream/develop' into fix/user-info-dm/17877
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-15 15:28:05 +02:00
34ce61862d
Merge pull request #6782 from SimonBrandner/fix/screensharing-dialog
...
Don't show screensharing dialog on web
2021-09-14 13:36:35 -06:00
7b9dc09cd4
Merge pull request #6784 from SimonBrandner/fix/end-of-line-emoji
...
Replace plain text emoji at the end of a line
2021-09-14 13:33:34 -06:00
18d406421b
Merge pull request #6806 from SimonBrandner/task/remove-message_send_failed
...
Remove `message_send_failed` dispatch
2021-09-14 13:10:07 -06:00
333418232d
Merge pull request #6808 from SimonBrandner/task/context_menus-ts
...
Convert `/context_menus` and `/avatars` to TS
2021-09-14 13:07:15 -06:00
6972cb248f
Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed
2021-09-14 19:31:12 +02:00
67d328c7fd
Merge remote-tracking branch 'upstream/develop' into task/structures-ts
2021-09-14 19:30:52 +02:00
fddc20dd89
Remove replies from hidden events when shown with `messages.ViewSourceEvent` ( #6796 )
...
As discovered in https://github.com/vector-im/element-web/issues/10391#is
Previously, if you turned on the `showHiddenEventsInTimeline` labs flag, edit (`m.replace`) events
that also have a `m.in_reply_to` field, will show the reply in the timeline.
ex.
```
{
"type": "m.room.message",
"content": {
"body": " * foo",
"msgtype": "m.text",
"m.new_content": {
"body": "foo",
"msgtype": "m.text"
},
"m.relates_to": {
"rel_type": "m.replace",
"event_id": "$yvuev9bF2nLRf8fscG55njpVjY3FHJzWgZ4BKI9_0eg",
"m.in_reply_to": {
"event_id": "$qkjmFBTEc0VvfVyzq1CJuh1QZi_xDIgNEFjZ4Pq34og"
}
}
}
}
```
2021-09-14 12:28:28 -05:00
0f55fde03a
Convert StatusMessageContextMenu to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:19 +02:00
11e61075b4
Convert GenericTextContextMenu to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:18 +02:00
8e4529d6ce
Convert GenericElementContextMenu to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:18 +02:00
5baaa6b77e
Convert MemberStatusMessageAvatar to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:12 +02:00
aab030d105
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts
2021-09-14 18:29:41 +02:00
db25147a19
Remove message_send_failed as it was unused
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 17:49:18 +02:00
047767bab0
Improve typing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 17:38:34 +02:00
2f6239770a
Merge remote-tracking branch 'upstream/develop' into task/structures-ts
2021-09-14 17:32:00 +02:00
b26bec949d
Use React.Children.count()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 17:19:57 +02:00
b8ee2d2b5b
Add warning that some spaces may not be relinked to the newly upgraded room
2021-09-14 16:14:25 +01:00
6900fb79c2
Merge pull request #6798 from matrix-org/t3chguy/fix/randoms
2021-09-14 15:53:02 +01:00
60f43f0171
Stop spinner on space preview if the join fails
2021-09-14 15:12:25 +01:00
5048e41e8b
Space Hierarchy react to known local rooms changing names
2021-09-14 14:41:51 +01:00
e37f6b96d7
Fix RoomTile subscribing to wrong event emitter for room name
2021-09-14 14:36:11 +01:00
Šimon Brandner