6ea79b297f
tweak message context icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:51 +02:00
ffca23344a
tweak context menu order
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:51 +02:00
8f6904ec1b
tweak the message menu cancel icon size
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
74f61795eb
add _MessageContextMenu.scss license header
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
62efea7e19
add message context menu icons
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:50 +02:00
e4eeafd485
migrate the message context menu to IconizedContextMenu
...
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2021-06-24 22:20:49 +02:00
4492627401
More js-sdk type consolidation
2021-06-24 19:20:02 +01:00
70bf47ced4
Merge branch 't3chguy/ts/8' into watch-show-timestamps
2021-06-24 12:53:37 -04:00
8f6d31b73c
Merge pull request #6251 from SimonBrandner/ts/entity-and-member-tile
2021-06-24 17:05:16 +01:00
3d6c6cea89
Fix AutoHideScrollbar typing
2021-06-24 16:43:12 +01:00
c5a1da49ce
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/8
...
Conflicts:
src/components/structures/AutoHideScrollbar.tsx
2021-06-24 16:42:03 +01:00
767b8cd5c7
Merge pull request #6260 from matrix-org/t3chguy/2
...
Fix UserInfo not working when rendered without a room
2021-06-24 16:37:35 +01:00
d83a92959b
Fix UserInfo not working when rendered without a room
2021-06-24 16:30:40 +01:00
d466d1a7ee
Add alwaysShowTimestamps and others to RoomView setting watchers
...
to allow them to update on the fly. This also modifies the setting
watchers to avoid an unnecessary settings lookup.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-24 11:28:16 -04:00
ff11244de8
Trailing spaces
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 17:27:53 +02:00
e282c4aa54
Simplifie code
...
Co-authored-by: Michael Telatynski <7t3chguy@googlemail.com>
2021-06-24 17:23:42 +02:00
430ae0e79f
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 16:59:18 +02:00
cc1f68296e
Iterate
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:58:56 +02:00
dc2f71bee6
Even more fixes
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:55:44 +02:00
006c6df205
Merge pull request #6253 from matrix-org/travis/leave-reasons
...
Update membership reason handling, including leave reason displaying
2021-06-24 08:52:34 -06:00
b065f6d1a4
Remove sdk...
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:48:36 +02:00
f0dbc974fa
Merge remote-tracking branch 'upstream/develop' into ts/entity-and-member-tile
2021-06-24 16:44:13 +02:00
c0a1127cb7
Fix PowerStatus
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:43:11 +02:00
f08b92309f
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 16:35:33 +02:00
bc786cdf4a
Merge pull request #6220 from matrix-org/t3chguy/ts/5.1
2021-06-24 15:23:59 +01:00
8fb788ae56
Iterate EntityTile once more
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:39:51 +02:00
5b21cff240
Iterate MemberTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:38:21 +02:00
1b64cd0c88
Iterate PresenceLabel
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:36:22 +02:00
f6bb0f4e75
Merge pull request #6258 from matrix-org/t3chguy/fix/17752
2021-06-24 13:34:45 +01:00
e436e28f01
Make TS happy
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:31:04 +02:00
298e505381
Iterate EntityTile
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:29:24 +02:00
cc1ff2ce1c
Remove unused import
2021-06-24 13:28:16 +01:00
f965d449b8
Merge pull request #6249 from SimonBrandner/ts/member-list
2021-06-24 13:25:59 +01:00
d2d8cb3c24
Think about what you copy-paste, Simon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:15:44 +02:00
0542c69b66
Fix types
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:13:27 +02:00
a774aed365
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:07:43 +02:00
6333d4aa36
Iterate PR
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 14:02:06 +02:00
7b1d64fe49
Merge pull request #6259 from matrix-org/t3chguy/1
2021-06-24 12:36:12 +01:00
6d3e7730ef
Fix two PRs duplicating the css attribute
2021-06-24 11:40:49 +01:00
a8b2c6d36b
Type event
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 12:24:42 +02:00
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051
2021-06-24 11:20:12 +01:00
4993fc3e7a
Fix edit history modal
...
defining enums in ts module declarations sadly isn't magic
2021-06-24 11:16:13 +01:00
01aadb460d
Fix cyclic imports
2021-06-24 11:12:32 +01:00
cd8f8dc458
Merge pull request #6256 from matrix-org/t3chguy/fix/17744
...
Fix invite dialog being cut off when it has limited results
2021-06-24 10:52:41 +01:00
26d8c4d2e6
Improve design of the multi inviter error dialog
2021-06-24 10:03:32 +01:00
09c22c37ff
Add comment to specify variable origin
2021-06-24 10:01:44 +01:00
21caa6df12
move live recording logic down the component tree
2021-06-24 09:58:11 +01:00
0fe6a28853
Merge remote-tracking branch 'upstream/develop' into feature/pinned-click
2021-06-24 10:57:09 +02:00
56467485f5
Merge branch 'develop' into gsouquet/voice-messages-waveform-perf
2021-06-24 09:42:47 +01:00
7eb3642692
i18n
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-06-24 10:42:01 +02:00
Michael Weimann