Michael Telatynski
|
8c08293654
|
Fix reactions aria-label not being a string and thus being read as [Object object]
|
2021-09-17 11:36:22 +01:00 |
|
Michael Telatynski
|
6e508e6a9a
|
Merge pull request #6821 from matrix-org/t3chguy/fix/npe1
|
2021-09-17 10:17:19 +01:00 |
|
Michael Telatynski
|
80caa5646f
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/npe1
|
2021-09-17 09:39:55 +01:00 |
|
Dariusz Niemczyk
|
58ffa5138b
|
Merge pull request #6822 from matrix-org/palid/thread-typescriptify
Transcriptify thread events a bit
|
2021-09-17 10:19:20 +02:00 |
|
Dariusz Niemczyk
|
0be6073058
|
Fix PR comments
|
2021-09-16 17:13:41 +02:00 |
|
Dariusz Niemczyk
|
d6788b023b
|
Fix PR comments
|
2021-09-16 16:04:18 +02:00 |
|
Dariusz Niemczyk
|
78587558d8
|
Transcriptify thread events a bit
|
2021-09-16 16:02:06 +02:00 |
|
Dariusz Niemczyk
|
d026dce723
|
Merge pull request #6820 from matrix-org/palid/fix/invalid-property-ts
Fix invalid accessor for method.
|
2021-09-16 15:29:21 +02:00 |
|
Michael Telatynski
|
1e91191fa2
|
Fix missing null guard in space hierarchy pagination
|
2021-09-16 14:28:55 +01:00 |
|
Dariusz Niemczyk
|
f7d8ae2b13
|
Fix invalid accessor for method.
|
2021-09-16 15:21:40 +02:00 |
|
Michael Telatynski
|
3da02f1546
|
Merge pull request #6819 from matrix-org/t3chguy/fix/build1
|
2021-09-16 11:33:20 +01:00 |
|
Michael Telatynski
|
ec4650c60d
|
Fix abuse of MainSplit in LegacyCommunityPreview
|
2021-09-16 11:23:41 +01:00 |
|
Michael Telatynski
|
febd3df5ac
|
Fix MainSplit IProps
|
2021-09-16 11:22:55 +01:00 |
|
Michael Telatynski
|
fd24511d42
|
Merge pull request #6805 from matrix-org/t3chguy/fix/18858
|
2021-09-16 10:48:20 +01:00 |
|
Michael Telatynski
|
3b39ba6590
|
Merge pull request #6787 from SimonBrandner/task/structures-ts
|
2021-09-16 10:45:12 +01:00 |
|
Michael Telatynski
|
bbc8e4da23
|
Merge pull request #6594 from matrix-org/t3chguy/fix/18088
|
2021-09-16 10:16:33 +01:00 |
|
Michael Telatynski
|
b052d0730d
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18858
|
2021-09-16 10:15:43 +01:00 |
|
Michael Telatynski
|
edf7764a3e
|
Merge pull request #6319 from SimonBrandner/fix/user-info-dm/17877
|
2021-09-16 10:09:22 +01:00 |
|
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 |
|
Michael Telatynski
|
8921e25815
|
Merge pull request #6804 from matrix-org/t3chguy/fix/18481
|
2021-09-16 10:02:06 +01:00 |
|
Travis Ralston
|
53041ba4b8
|
Merge pull request #6816 from matrix-org/revert-6809-madlittlemods/10391-show-relations-in-new-edit-content
Revert "Show updated relation reply from edited message"
|
2021-09-15 14:35:05 -06: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 |
|
David Baker
|
9bff6afd11
|
Merge pull request #6814 from matrix-org/dbkr/yarnupgrade_20210914
yarn upgrade
|
2021-09-15 17:53:05 +01: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
|
22500a2e29
|
yarn upgrade
And also pin @types/react harder because yarn wanted to give
@types/flux a newer version meaning they conflicted.
|
2021-09-15 16:59:13 +01:00 |
|
David Baker
|
2ffbf3aa72
|
Merge pull request #6813 from matrix-org/dbkr/pin_typescript
Pin typescript/types version
|
2021-09-15 16:21:34 +01:00 |
|
James Salter
|
5c2467df7e
|
Merge pull request #6810 from matrix-org/redact-all-rooms
Redact all room data in tracking
|
2021-09-15 16:20:45 +01:00 |
|
David Baker
|
16065e0a8b
|
Pin react too...
|
2021-09-15 16:14:58 +01:00 |
|
David Baker
|
4e694df6b0
|
Pin typescript/types version
type: task
Because we have a collection of usages of things and conflicts
that break with the new version: https://github.com/vector-im/element-web/issues?q=is%3Aissue+is%3Aopen+preventing+TypeScript+upgrade
|
2021-09-15 16:04:26 +01:00 |
|
David Baker
|
b09ebca688
|
Merge pull request #6812 from matrix-org/dbkr/fix_roomlist_prompt
Fix checks to show prompt to start new chats
|
2021-09-15 15:54:53 +01: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 |
|
Šimon Brandner
|
a571460871
|
Use a universal copy
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-09-15 15:30:23 +02:00 |
|
Šimon Brandner
|
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 |
|
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 |
|
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 |
|
Travis Ralston
|
1f1693cb09
|
Merge pull request #6781 from SimonBrandner/feature/media-handling
Improve `MatrixCall` media handling
|
2021-09-14 14:40:57 -06: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 |
|
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
|
fdb004b4e8
|
Merge pull request #6785 from robintown/message-bubble-misc
Fix various message bubble alignment issues
|
2021-09-14 13:26:03 -06: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 |
|
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 |
|
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 |
|