Šimon Brandner
|
dd6379cf4b
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-20 13:15:04 +02:00 |
|
Germain Souquet
|
06c9a060b4
|
Merge branch 'develop' into gsouquet/message-bubbles-4635
|
2021-07-20 10:16:21 +02:00 |
|
Šimon Brandner
|
5c5b79a972
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-17 08:13:51 +02:00 |
|
Robin Townsend
|
092fdf5e5e
|
Be consistent about MessagePanel setting lookups
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-07-16 18:46:29 -04:00 |
|
Robin Townsend
|
158e6fa61c
|
Merge branch 'develop' into text-for-event-perf
|
2021-07-16 18:24:22 -04:00 |
|
Šimon Brandner
|
16ed5c6645
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-16 21:43:33 +02:00 |
|
Michael Telatynski
|
b0053f36d3
|
Fix instances of event.sender being read for just the userId - this field may not be set in time
|
2021-07-15 17:43:24 +01:00 |
|
Germain Souquet
|
dde58d449d
|
Only hide sender when in bubble mode
|
2021-07-14 17:16:13 +02:00 |
|
Germain Souquet
|
55896223aa
|
unbubble some type of events
|
2021-07-07 15:13:58 +02:00 |
|
Germain Souquet
|
7d946ee0db
|
Restore action bar
|
2021-07-07 12:04:28 +02:00 |
|
Šimon Brandner
|
85399e8edf
|
Match code style
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-02 13:16:45 +02:00 |
|
Šimon Brandner
|
b014763cd2
|
Merge remote-tracking branch 'upstream/develop' into feature/call-event-tile
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
|
2021-07-02 13:14:14 +02:00 |
|
Robin Townsend
|
adb5df52a4
|
Merge branch 'develop' into text-for-event-perf
|
2021-06-29 22:13:18 -04:00 |
|
Michael Telatynski
|
a59e94b907
|
delint
|
2021-06-29 22:21:05 +01:00 |
|
Michael Telatynski
|
8f4879ea96
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/ScrollPanel.tsx
src/components/structures/TimelinePanel.tsx
src/components/views/elements/ErrorBoundary.tsx
src/components/views/elements/EventListSummary.tsx
src/components/views/messages/TileErrorBoundary.tsx
|
2021-06-29 22:14:40 +01:00 |
|
Michael Telatynski
|
623317cd47
|
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
Conflicts:
src/components/structures/MessagePanel.tsx
src/components/structures/TimelinePanel.tsx
|
2021-06-29 15:22:54 +01:00 |
|
Robin Townsend
|
a921d32f44
|
Fix lint
Signed-off-by: Robin Townsend <robin@robin.town>
|
2021-06-24 18:51:46 -04:00 |
|
Robin Townsend
|
f9fe28a6ad
|
Merge branch 't3chguy/ts/8' into text-for-event-perf
|
2021-06-24 18:45:08 -04:00 |
|
Michael Telatynski
|
cecf0ce299
|
Convert MessagePanel, TimelinePanel, ScrollPanel, and more to Typescript
|
2021-06-22 20:41:26 +01:00 |
|