James Salter
73f9e48c11
Fix comment
2021-09-15 14:17:52 +01:00
James Salter
93321d96f0
lint
2021-09-15 14:10:15 +01:00
James Salter
839fdbca62
fix tests
2021-09-15 13:55:34 +01:00
James Salter
8f1204c32e
Update comment reflecting tracking scheme via analytics ID
2021-09-15 13:00:59 +01:00
James Salter
76c782c64c
Remove all room data from tracking
...
Always redact room fragments entirely; remove room utils
2021-09-15 12:58:26 +01:00
Weblate
6155d114ef
Merge branch 'origin/develop' into Weblate.
2021-09-15 11:51:15 +00:00
waclaw66
f6f4daec00
Translated using Weblate (Czech)
...
Currently translated at 100.0% (3163 of 3163 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/cs/
2021-09-15 11:51:14 +00:00
Jeff Huang
714af54be4
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (3163 of 3163 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/zh_Hant/
2021-09-15 11:51:12 +00:00
jelv
b24ad3a447
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (3163 of 3163 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/nl/
2021-09-15 11:51:10 +00:00
Szimszon
dd7253e848
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (3163 of 3163 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/hu/
2021-09-15 11:51:08 +00:00
James Salter
1aabe4b535
Merge pull request #6807 from matrix-org/pseudonymous-analytics-id
...
Replace Posthog user hash-based tracking with a UUID stored in account_data
2021-09-15 12:50:59 +01:00
James Salter
79f03dfec3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into pseudonymous-analytics-id
2021-09-15 09:52:15 +01:00
James Salter
48fbbf2f44
Fix import, convert event type to constant
2021-09-15 09:48:48 +01:00
Weblate
391b34ebd7
Merge branch 'origin/develop' into Weblate.
2021-09-14 20:41:01 +00:00
Travis Ralston
1f1693cb09
Merge pull request #6781 from SimonBrandner/feature/media-handling
...
Improve `MatrixCall` media handling
2021-09-14 14:40:57 -06:00
Weblate
21743d8ad2
Merge branch 'origin/develop' into Weblate.
2021-09-14 19:40:25 +00:00
Travis Ralston
30972c597d
Merge pull request #6777 from robintown/room-list-scroll-jumps
...
Fix room list scroll jumps
2021-09-14 13:40:20 -06:00
Weblate
2e476db30c
Merge branch 'origin/develop' into Weblate.
2021-09-14 19:36:39 +00: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
Weblate
6b55ba8afb
Merge branch 'origin/develop' into Weblate.
2021-09-14 19:33:42 +00:00
Priit Jõerüüt
f56afe219c
Translated using Weblate (Estonian)
...
Currently translated at 99.9% (3161 of 3163 strings)
Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.element.io/projects/element-web/matrix-react-sdk/et/
2021-09-14 19:33:41 +00: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
Weblate
5ddbbfe7bd
Merge branch 'origin/develop' into Weblate.
2021-09-14 19:26:08 +00:00
Travis Ralston
fdb004b4e8
Merge pull request #6785 from robintown/message-bubble-misc
...
Fix various message bubble alignment issues
2021-09-14 13:26:03 -06:00
Weblate
8a430cfe5f
Merge branch 'origin/develop' into Weblate.
2021-09-14 19:25:32 +00:00
Travis Ralston
c3ad978941
Merge pull request #6795 from robintown/message-bubble-font-size
...
Make message bubble font size consistent
2021-09-14 13:25:28 -06:00
Weblate
bffd3b4f13
Merge branch 'origin/develop' into Weblate.
2021-09-14 19:10:12 +00:00
Travis Ralston
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
Weblate
fc1da27d49
Merge branch 'origin/develop' into Weblate.
2021-09-14 19:07:19 +00: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
Weblate
2fbdd737c9
Merge branch 'origin/develop' into Weblate.
2021-09-14 17:47:11 +00:00
David Baker
f6b0b12c60
fix lockfile
2021-09-14 18:47:01 +01:00
Šimon Brandner
6972cb248f
Merge remote-tracking branch 'upstream/develop' into task/remove-message_send_failed
2021-09-14 19:31:12 +02:00
Šimon Brandner
67d328c7fd
Merge remote-tracking branch 'upstream/develop' into task/structures-ts
2021-09-14 19:30:52 +02:00
Weblate
1059643d3e
Merge branch 'origin/develop' into Weblate.
2021-09-14 17:28:32 +00: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
James Salter
c2192a78bc
More lint
2021-09-14 18:16:48 +01:00
James Salter
6c1dea09e8
lint
2021-09-14 17:46:56 +01:00
Robin Townsend
9b3da61ae4
Remove unnecessary unset
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:37:45 -04:00
Robin Townsend
8824b12064
Fix alignment of sender name in message bubble replies
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-09-14 12:35:51 -04:00
James Salter
7344a177e3
Fix tests, swallow errors
2021-09-14 17:35:32 +01:00
Robin Townsend
c31fb79d46
Merge branch 'develop' into message-bubble-misc
2021-09-14 12:31:58 -04:00
Šimon Brandner
aab030d105
Merge remote-tracking branch 'upstream/develop' into task/dialogs-ts
2021-09-14 18:29:41 +02:00
Šimon Brandner
f5d8bb7cbe
Remove awaiting setState()
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 18:15:27 +02:00
Šimon Brandner
ccc042b7d7
Where does that magic number come from?
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 18:06:01 +02:00
Šimon Brandner
8e3be15365
Move animations into _animations
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-09-14 18:05:15 +02:00