Commit Graph

35216 Commits (45f9f3e13ec763bdd89746666f6ddc206e6b7fd1)

Author SHA1 Message Date
David Baker 96ddfefc03
Merge pull request #6403 from matrix-org/dbkr/upgrade_eslint_plugin_matrix_org
Update eslint-plugin-matrix-org
2021-07-19 15:34:21 +01:00
Dariusz Niemczyk 9e9992078b
Update src/@types/global.d.ts
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-19 16:34:07 +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
David Baker 99edfc24e5 Update eslint-plugin-matrix-org 2021-07-19 15:26:40 +01:00
James Salter 1ea70e5b6e
Merge pull request #6402 from matrix-org/copy-room-link
Rename Copy Link to Copy Room Link
2021-07-19 15:14:19 +01: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
Michael Telatynski 48817499e4
Merge pull request #6399 from matrix-org/t3chguy/fix/18032
Don't throw exception from setStickyRoom as it split-brains the RoomListStore
2021-07-19 12:53:34 +01:00
Michael Telatynski c1ed023e17 Update Twemoji fonts for Unicode Emoji 13.1 2021-07-19 10:45:26 +01: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
Michael Telatynski e54a7f0997 Don't throw exception from setStickyRoom as it split-brains the RoomListStore 2021-07-19 09:36:25 +01:00
Travis Ralston 70e525d672 Fix component export 2021-07-18 17:06:30 -06: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
Michael Telatynski 096d0a7d12 Respect grapheme clustering in default avatar initial generation to not break emojis 2021-07-17 23:00:46 +01: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 e3eac48d05
Cleanup _ReplyPreview.scss
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:54 +02:00
Šimon Brandner c9a11af26b
Give singletonRoomViewStore a type
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:25:53 +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
Michael Telatynski 88aa2182b6
Merge pull request #6395 from SimonBrandner/fix/image-view-title/18037 2021-07-17 14:11:43 +01:00
Šimon Brandner 96acd6c9ef
Cleanup _ReplyThread.scss
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 15:06:31 +02: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 75fc1299fb
Merge remote-tracking branch 'upstream/develop' into task/cleanup-replies 2021-07-17 08:26:28 +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 313964e796
Fix call event tile not behaving
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-17 08:12:53 +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
Travis Ralston d2de9b432c
Apply suggestions from code review
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 23:50:06 -06:00
Michael Telatynski 0f15cee583
Merge pull request #6205 from robintown/text-for-event-perf 2021-07-17 00:08:34 +01: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