Michael Telatynski
e17318a364
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-16 10:05:20 +01:00
Travis Ralston
a103a2ceaa
Revert "Show updated relation reply from edited message ( #6809 )"
...
This reverts commit eaab8e1570
2021-09-15 14:34:28 -06:00
Eric Eastwood
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
David Baker
4f53e6cddd
Merge remote-tracking branch 'origin/develop' into dbkr/fix_roomlist_prompt
2021-09-15 15:13:52 +01:00
David Baker
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
Travis Ralston
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
Travis Ralston
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
Travis Ralston
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
Eric Eastwood
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
Šimon Brandner
0f55fde03a
Convert StatusMessageContextMenu to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:19 +02:00
Šimon Brandner
11e61075b4
Convert GenericTextContextMenu to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:18 +02:00
Šimon Brandner
8e4529d6ce
Convert GenericElementContextMenu to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:18 +02:00
Šimon Brandner
5baaa6b77e
Convert MemberStatusMessageAvatar to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 19:23:12 +02:00
Michael Telatynski
e37f6b96d7
Fix RoomTile subscribing to wrong event emitter for room name
2021-09-14 14:36:11 +01:00
Michael Telatynski
e3ec00bcdf
Fix space create menu eating first character of name in private space creation
2021-09-14 14:35:33 +01:00
Michael Telatynski
ff39f480bc
Merge pull request #6778 from matrix-org/t3chguy/fix/18891
2021-09-14 14:07:43 +01:00
Dariusz Niemczyk
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
Michael Telatynski
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
Michael Telatynski
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
Dariusz Niemczyk
e913f03a67
Add missing types
2021-09-13 22:11:43 +02:00
Michael Telatynski
4a470e4341
Fix automatic field population in space create menu not validating
2021-09-13 17:15:52 +01:00
Michael Telatynski
b6b099f6c8
Fix broken edge case with public space creation with no alias
2021-09-13 16:27:46 +01:00
Michael Telatynski
d75820a491
Hide mute/unmute button in UserInfo for Spaces as it makes no sense
2021-09-13 13:49:24 +01:00
Šimon Brandner
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
Šimon Brandner
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
Šimon Brandner
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
Michael Telatynski
ca0d8116ad
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18908
2021-09-10 18:02:48 +01:00
Germain
1a4859ede8
Merge pull request #6727 from SimonBrandner/task/i-hate-my-code
2021-09-10 16:14:24 +01:00
Michael Telatynski
d15ea932f6
fix unrelated issues
2021-09-10 15:35:35 +01:00
Michael Telatynski
d46181385c
Also default to PL invite=50 for private space creation
2021-09-10 13:05:04 +01:00
Michael Telatynski
6fcd930d0b
fix unrelated issues
2021-09-10 11:54:25 +01:00
Michael Telatynski
41676b4a9b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18891
2021-09-10 11:09:52 +01:00
Michael Telatynski
aff9be6120
Surface unsent messages on the sublist notification badge too
2021-09-10 10:58:13 +01:00
Michael Telatynski
cd73bbf2f5
Merge pull request #6724 from matrix-org/t3chguy/fix/18798
2021-09-10 09:56:56 +01:00
Michael Telatynski
80fd960304
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18088
2021-09-10 09:53:04 +01:00
Michael Telatynski
2a8e8b93aa
add comment
2021-09-10 09:48:46 +01:00
Michael Telatynski
558b292c25
Adapt and re-use the RolesRoomSettingsTab for Spaces
2021-09-10 09:41:58 +01:00
Michael Telatynski
bbe714257e
Show unsent message warning on Space panel button
2021-09-10 09:17:31 +01:00
Germain
d475b7f1ea
Merge pull request #6753 from matrix-org/revert-6752-revert-6682-gsouquet/compact-composer-18533
2021-09-09 18:49:38 +01:00
Travis Ralston
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
Travis Ralston
bdb29e96fa
Merge pull request #6766 from matrix-org/travis/measure-encryption-perf
...
Add config option to turn on in-room event sending timing metrics
2021-09-09 10:38:15 -06:00
Germain Souquet
07ebd85f7e
Merge branch 'develop' into revert-6752-revert-6682-gsouquet/compact-composer-18533
2021-09-09 13:30:35 +01:00
Germain Souquet
aa53444267
Improve narrow composer usability
2021-09-09 13:27:25 +01:00
Michael Telatynski
329bc8a89e
Move unsent event badge handling into RoomNotificationState
2021-09-09 13:14:05 +01:00
Michael Telatynski
630835961b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18798
...
Conflicts:
src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-09-09 11:01:11 +01:00
Michael Telatynski
2eb64de508
Tweak edge case behaviour
2021-09-09 10:54:31 +01:00
Michael Telatynski
fa60b24a9f
fix react error in console
2021-09-09 10:50:12 +01:00
Michael Telatynski
e17a5328d2
Merge pull request #6764 from matrix-org/t3chguy/fix/18677
2021-09-08 23:00:01 +01:00
Michael Telatynski
d00c4d042b
Merge pull request #6760 from matrix-org/t3chguy/fix/18528
...
Improve tooltips on space quick actions and explore button
2021-09-08 22:59:52 +01:00
Michael Telatynski
086d36beb1
Merge pull request #6765 from matrix-org/t3chguy/fix/17018
...
Make space members and user info behave more expectedly
2021-09-08 22:59:44 +01:00
