c25feb9b9f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-20 15:48:25 +02:00
ad50d23cc2
Revert accidental renaming of dispatcherRef
2021-07-20 13:56:49 +01:00
66a3b0fe5f
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 13:24:05 +02:00
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
d3934ff7da
Merge branch 'develop' into t3chguy/eslint
2021-07-20 11:08:13 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
863f4d4f9f
Merge pull request #6394 from matrix-org/dbkr/exorcise_homeserver_checkbox
...
Fix bug where 'other homeserver' would unfocus
2021-07-19 10:09:03 +01:00
4ef4f49e90
Merge pull request #6392 from SimonBrandner/task/cleanup-replies
2021-07-18 13:37:44 +01:00
e439d2e911
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:29:18 +02:00
03ce480066
Convert ReplyThread to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:06:21 +02:00
6d4ae6481a
Add alt
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 08:21:46 +02:00
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
bb643010a9
Remove title
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 08:10:34 +02:00
e3e7d945fd
Remove useless spread operator
2021-07-16 23:51:44 -06:00
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
45fb0e927f
Mention nested labels in comments
2021-07-16 22:35:53 +01:00
f9b45677d6
Fix bug where 'other homeserver' would unfocus
...
It turns out the answer to this was not all that complex: we had
two nested <label>s: one for the radio button and one for the Field,
which presumably causes both of them to generate click events and
focus something and what ends up focused is some kind of race condition
depending on, apparently, how fast you click.
Notes: Fix bug where the 'other homeserver' field in the server selection dialog would become briefly focus and then unfocus when clicked.
2021-07-16 22:27:31 +01:00
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
31f5d012b8
Improve the look and feel of the picker
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-16 21:16:07 +02:00
77c8425c3c
Rewrite using TabbedView and improve TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-16 20:50:29 +02:00
d512a83a6c
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-16 19:37:57 +02:00
7f9f2dbbcb
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-15 14:54:06 +02:00
f4788a6427
Add dialpad to transfer dialog + various dialpad UI improvements ( #6363 )
...
Co-authored-by: Germain <germain@souquet.com >
Co-authored-by: Andrew Morgan <andrew@amorgan.xyz >
Co-authored-by: David Baker <dbkr@users.noreply.github.com >
2021-07-15 09:55:58 +01:00
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1
2021-07-14 17:19:07 +01:00
51c5094ca4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 17:47:22 +02:00
acd37d2aad
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-14 16:53:05 +02:00
789d078814
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 16:26:22 +02:00
9b6495903c
Use TileShape enum more universally
2021-07-13 18:35:56 -06:00
46e1fdf442
Reorder buttons
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-13 20:28:49 +02:00
76157a7b48
Standardise casing of integration manager
...
Replace instances of 'Integration Manager' with 'Integration manager', when at start of
sentence, or 'integration manager' when not.
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com >
2021-07-13 16:28:44 +01:00
0bbdfefd0d
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
2021-07-13 13:21:27 +02:00
8f831a89f6
Remove unused code
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-13 13:07:47 +02:00
ba3e7e24ba
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-13 10:15:27 +02:00
cbe94c3c5f
Kill-off sdk.getComponent
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-13 08:23:01 +02:00
7bd7f704f9
Extend IDialogProps
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-13 08:20:17 +02:00
2e295a94ed
Don't export IProps
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-13 08:17:51 +02:00
4444ccb079
Appease the linter
2021-07-13 00:02:44 -06:00
3ae76c84f6
Add a simple TagComposer for the keywords entry
2021-07-12 23:55:08 -06:00
5a834fbc06
Convert Spinner to TS
2021-07-12 18:30:42 -06:00
ae6eaa5acc
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c1
...
Conflicts:
src/components/structures/RoomDirectory.tsx
src/components/views/room_settings/RoomPublishSetting.tsx
2021-07-12 18:58:18 +01:00
f049edf605
Merge branch 'develop' into quit-sticker-picker
2021-07-12 09:26:11 +01:00
33dca81352
Update some more
2021-07-12 09:10:27 +01:00
bd175c6f40
Improve and consolidate typing
2021-07-10 15:43:46 +01:00
ac309a0d08
Merge pull request #6332 from SimonBrandner/fix/focus-composer-reaction/11023
2021-07-09 09:05:54 +01:00
b9be0896f1
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/pins
2021-07-09 07:48:12 +01:00
68d194444a
FocusComposer -> FocusSendMessageComposer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-08 17:36:31 +02:00
b7af39ffff
Merge remote-tracking branch 'upstream/develop' into compact-reply-rendering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-08 17:17:34 +02:00
8e7e4c9e8d
Convert MessageContextMenu to Typescript
2021-07-08 14:47:36 +01:00
Šimon Brandner