Robin Townsend
f8a922eaa1
Apply code review suggestions
...
including filling in gaps in emoji shortcode coverage.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-19 15:09:15 -04:00
Travis Ralston
b31043b5eb
Revert order of notification setting radios
...
Follow-on from https://github.com/matrix-org/matrix-react-sdk/pull/6352
Fixes https://github.com/vector-im/element-web/issues/18048
2021-07-19 10:15:42 -06:00
Šimon Brandner
5d5b9f6022
Better labeling of images and stickers
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-19 18:04:33 +02:00
Michael Telatynski
f2a88599a4
delint
2021-07-19 16:51:43 +01:00
Michael Telatynski
de42a00ca4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/avatars/RoomAvatar.tsx
test/stores/SpaceStore-test.ts
test/test-utils.js
2021-07-19 16:47:31 +01:00
Dariusz Niemczyk
5acc7fe8d4
Make errorText
properly optional instead of null
2021-07-19 16:49:39 +02:00
Dariusz Niemczyk
97d490c1b6
Update src/components/views/auth/CaptchaForm.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-19 16:28:30 +02:00
Dariusz Niemczyk
c2394b9161
Fix styling comments
2021-07-19 16:27:39 +02:00
James Salter
f9fbf6f210
Rename Copy Link to Copy Room Link
...
Being explicit is clearer when this context menu applies to DM rooms, to make it clear that the link will be to the room and not to the person
2021-07-19 15:05:04 +01:00
Dariusz Niemczyk
9de5ebd4de
Fix grecaptcha throwing useless error sometimes
2021-07-19 15:41:44 +02:00
David Baker
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
Travis Ralston
70e525d672
Fix component export
2021-07-18 17:06:30 -06:00
Robin Townsend
c0123f5dad
Merge branch 'develop' into watch-show-timestamps
2021-07-18 11:47:44 -04:00
Michael Telatynski
4ef4f49e90
Merge pull request #6392 from SimonBrandner/task/cleanup-replies
2021-07-18 13:37:44 +01:00
Šimon Brandner
21eb299eff
Make roomStoreToken readonly
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-18 14:32:24 +02:00
Šimon Brandner
d7e6856614
More delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:37:52 +02:00
Šimon Brandner
e439d2e911
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:29:18 +02:00
Šimon Brandner
7b45efc9e9
Fix EventTile typing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:28:02 +02:00
Šimon Brandner
2a7787e12d
Convert ReplyPreview to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:42 +02:00
Michael Telatynski
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors
2021-07-17 14:12:29 +01:00
Šimon Brandner
03ce480066
Convert ReplyThread to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:21 +02:00
Šimon Brandner
6d4ae6481a
Add alt
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:21:46 +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
Šimon Brandner
bb643010a9
Remove title
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:10:34 +02:00
Travis Ralston
2089127dad
Merge pull request #6352 from matrix-org/travis/notifications-2
...
Notification settings UI refresh
2021-07-16 23:56:48 -06:00
Travis Ralston
e3e7d945fd
Remove useless spread operator
2021-07-16 23:51:44 -06: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
Travis Ralston
60bcdd3bf8
Fix types from js-sdk
2021-07-16 16:29:25 -06:00
Robin Townsend
158e6fa61c
Merge branch 'develop' into text-for-event-perf
2021-07-16 18:24:22 -04:00
Travis Ralston
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
Travis Ralston
4d38218e24
Appease the linter
2021-07-16 16:11:27 -06:00
Travis Ralston
31d7de628e
Small tweaks
2021-07-16 16:04:23 -06:00
Travis Ralston
b57fff5739
Update visual style and sandbox properly
2021-07-16 15:55:07 -06:00
David Baker
45fb0e927f
Mention nested labels in comments
2021-07-16 22:35:53 +01:00
David Baker
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
Travis Ralston
623f2e7613
Only show download link below media if it's not in the timeline
2021-07-16 15:12:36 -06:00
Travis Ralston
7ba0adba77
Appease type system
2021-07-16 15:12:36 -06:00
Travis Ralston
d156a56603
Share body prop types with an interface
2021-07-16 15:12:36 -06:00
Travis Ralston
ea7513fc16
Convert MFileBody to TS and use media helper
2021-07-16 15:12:36 -06:00
Travis Ralston
5fce0ccd9d
Convert images, audio, and voice messages over to the new helper
2021-07-16 15:12:36 -06:00
Travis Ralston
040802e29f
Clean up after POC
2021-07-16 15:12:36 -06:00
Travis Ralston
584ffbd327
Fix refreshing the page not showing a download
2021-07-16 15:12:36 -06:00
Travis Ralston
703cf73759
Convert MessageEvent to TS and hoist MediaEventHelper
2021-07-16 15:12:36 -06:00
Travis Ralston
0a99f76e7f
Simple POC for moving download button to action bar
2021-07-16 15:12:36 -06:00
Robin Townsend
f88d5dd24e
Zip shortcodes in with emoji objects
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-07-16 16:36:03 -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
Šimon Brandner
2a2b8adabc
Merge remote-tracking branch 'upstream/develop' into fix/12652/screen-share
2021-07-16 21:38:46 +02:00
Šimon Brandner
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
Michael Telatynski
aaa9040634
Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1
2021-07-16 19:58:38 +01:00
Šimon Brandner
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