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
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
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
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
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
e3ec00bcdf
Fix space create menu eating first character of name in private space creation
2021-09-14 14:35:33 +01:00
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891
2021-09-14 14:07:43 +01:00
74e4cc9680
Merge pull request #6793 from matrix-org/palid/fix/19012
...
Fix emoji picker and stickerpicker not appearing correctly when opened
2021-09-14 14:56:49 +02:00
60174c9836
Add a better comment describing the behavior
2021-09-14 14:51:17 +02:00
3c44969645
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/19003
...
Conflicts:
src/components/views/spaces/SpaceCreateMenu.tsx
2021-09-14 11:42:51 +01:00
be58a5e623
Merge pull request #6790 from matrix-org/t3chguy/fix/19007
...
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
2021-09-14 09:07:37 +01:00
73a2225b10
Merge pull request #6792 from matrix-org/t3chguy/fix/19005
...
Fix automatic field population in space create menu not validating
2021-09-14 09:06:49 +01:00
ceafa83392
Fix invalid ContextualMenu positions
2021-09-13 22:11:58 +02:00
e913f03a67
Add missing types
2021-09-13 22:11:43 +02:00
4a470e4341
Fix automatic field population in space create menu not validating
2021-09-13 17:15:52 +01:00
b6b099f6c8
Fix broken edge case with public space creation with no alias
2021-09-13 16:27:46 +01:00
d75820a491
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
2021-09-13 13:49:24 +01:00
354d0cfba4
Redirect from /#/welcome to /#/home if already logged in
...
Signed-off-by: Aaron Raimist <aaron@raim.ist >
2021-09-11 10:52:33 -05:00
f4ca073b4a
Don't auto replace if not enabled
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-09-11 10:26:15 +02:00
fd022310b3
Merge remote-tracking branch 'upstream/develop' into fix/end-of-line-emoji
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-09-11 10:21:56 +02:00
0defc4b14b
Don't show screensharing dialog on web
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-09-11 09:03:04 +02:00
ca0d8116ad
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908
2021-09-10 18:02:48 +01:00
1a4859ede8
Merge pull request #6727 from SimonBrandner/task/i-hate-my-code
2021-09-10 16:14:24 +01:00
d15ea932f6
fix unrelated issues
2021-09-10 15:35:35 +01:00
d46181385c
Also default to PL invite=50 for private space creation
2021-09-10 13:05:04 +01:00
6fcd930d0b
fix unrelated issues
2021-09-10 11:54:25 +01:00
41676b4a9b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891
2021-09-10 11:09:52 +01:00
aff9be6120
Surface unsent messages on the sublist notification badge too
2021-09-10 10:58:13 +01:00
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798
2021-09-10 09:56:56 +01:00
2a8e8b93aa
add comment
2021-09-10 09:48:46 +01:00
558b292c25
Adapt and re-use the RolesRoomSettingsTab for Spaces
2021-09-10 09:41:58 +01:00
bbe714257e
Show unsent message warning on Space panel button
2021-09-10 09:17:31 +01:00
def1c68c16
Fix message bubble corners being wrong in the presence of hidden events
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-09-09 16:11:36 -04:00
051e166c68
Merge pull request #6772 from matrix-org/gsouquet/fix-18947
2021-09-09 18:56:49 +01:00
d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533
2021-09-09 18:49:38 +01:00
3f28454a8e
Merge pull request #6771 from matrix-org/dbkr/debounce_read_marker_update
...
Debounce read marker update on scroll
2021-09-09 18:24:08 +01:00
bd5d02d690
Update comment too
...
Co-authored-by: Travis Ralston <travisr@matrix.org >
2021-09-09 18:15:51 +01:00
a6d2bb5e6c
Merge pull request #6693 from SimonBrandner/fix/guest/18776
...
Render guest settings only in public rooms/spaces
2021-09-09 10:42:38 -06:00
David Baker