a759d61ba0
Play only one audio file at a time
...
Fixes https://github.com/vector-im/element-web/issues/17439
2021-07-20 23:28:07 -06:00
44b8bace47
Merge branch 'develop' into fix/15142/fix-grecaptcha-race-condition
...
* develop: (141 commits)
delint
Doc some values
Remove useless image reference
Revert accidental renaming of dispatcherRef
Fix event highlighthing
Move some code around for clarity
Constrain emoji skins type even further
Delint
i18n irc and fix lint from merge conflict
Remove unwanted coma in EventTile
fix three lints
lint fix
not sure how these happened :/
remove unused prop
Update eslint-plugin-matrix-org
Fix placeholder centering
Make emoji skins type more specific
Rename some variables since their purpose has changed
Conform to new react and typescript eslint rules
Apply code review suggestions
...
2021-07-20 17:33:05 +02:00
7892539a9b
delint
2021-07-20 09:03:26 -06:00
5994111e5d
Merge remote-tracking branch 'origin/develop' into travis/voice-messages/download
2021-07-20 08:55:53 -06:00
32d8da2c74
Remove useless image reference
2021-07-20 08:52:55 -06:00
ad50d23cc2
Revert accidental renaming of dispatcherRef
2021-07-20 13:56:49 +01:00
c47a05cc48
Merge pull request #6121 from SimonBrandner/feature/call-event-tile
...
Add VoIP event tiles
2021-07-20 13:31:53 +01:00
d8c4ab53e0
Merge pull request #6347 from robintown/emojibase-updates
2021-07-20 12:57:00 +01:00
6cb1c5d918
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 13:20:30 +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
770de8f6b5
Merge pull request #6408 from matrix-org/t3chguy/eslint
2021-07-20 11:23:36 +01:00
b94886a291
i18n irc and fix lint from merge conflict
2021-07-20 11:18:27 +01:00
d3934ff7da
Merge branch 'develop' into t3chguy/eslint
2021-07-20 11:08:13 +01:00
e38682d75c
Remove unwanted coma in EventTile
2021-07-20 12:05:18 +02:00
9fe9534e01
fix three lints
2021-07-20 10:33:52 +01:00
53ae7817bc
Merge pull request #6291 from matrix-org/gsouquet/message-bubbles-4635
2021-07-20 10:22:41 +01:00
dd65d47fba
lint fix
2021-07-20 11:12:17 +02:00
848b83015d
not sure how these happened :/
2021-07-20 09:37:54 +01:00
e6869797d7
remove unused prop
2021-07-20 09:27:32 +01:00
06c9a060b4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-20 10:16:21 +02:00
e11e17eb85
Merge pull request #6411 from SimonBrandner/fix/sticker-placeholder/18014
2021-07-20 09:11:28 +01:00
5db20d9431
Fix placeholder centering
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-20 08:54:32 +02:00
ce78cdf4ad
Conform to new react and typescript eslint rules
2021-07-19 22:43:11 +01:00
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
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
5acc7fe8d4
Make errorText properly optional instead of null
2021-07-19 16:49:39 +02:00
97d490c1b6
Update src/components/views/auth/CaptchaForm.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-19 16:28:30 +02:00
c2394b9161
Fix styling comments
2021-07-19 16:27:39 +02:00
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
9de5ebd4de
Fix grecaptcha throwing useless error sometimes
2021-07-19 15:41:44 +02: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
70e525d672
Fix component export
2021-07-18 17:06:30 -06:00
4ef4f49e90
Merge pull request #6392 from SimonBrandner/task/cleanup-replies
2021-07-18 13:37:44 +01:00
21eb299eff
Make roomStoreToken readonly
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-18 14:32:24 +02:00
d7e6856614
More delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:37:52 +02:00
e439d2e911
Delint
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:29:18 +02:00
7b45efc9e9
Fix EventTile typing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:28:02 +02:00
2a7787e12d
Convert ReplyPreview to TS
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-17 15:25:42 +02:00
f7767bf09c
Merge pull request #6393 from robintown/match-avatar-colors
2021-07-17 14:12:29 +01: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
2089127dad
Merge pull request #6352 from matrix-org/travis/notifications-2
...
Notification settings UI refresh
2021-07-16 23:56:48 -06:00
e3e7d945fd
Remove useless spread operator
2021-07-16 23:51:44 -06:00
092fdf5e5e
Be consistent about MessagePanel setting lookups
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-16 18:46:29 -04:00
60bcdd3bf8
Fix types from js-sdk
2021-07-16 16:29:25 -06:00
158e6fa61c
Merge branch 'develop' into text-for-event-perf
2021-07-16 18:24:22 -04:00
942cadc8a3
Merge branch 'develop' into travis/notifications-2
2021-07-16 16:20:23 -06:00
4d38218e24
Appease the linter
2021-07-16 16:11:27 -06:00
Travis Ralston