fdd98bbf3f
linter fix
2021-07-20 09:55:26 +02:00
bb03fd90c8
Merge branch 'develop' into gsouqet/ts-migration-1
2021-07-20 09:02:48 +02: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
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
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
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
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
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
aaa9040634
Merge pull request #6391 from matrix-org/t3chguy/fix/14508.1
2021-07-16 19:58:38 +01:00
25e6a0e570
Match colors of room and user avatars in DMs
...
Signed-off-by: Robin Townsend <robin@robin.town >
2021-07-16 14:19:36 -04:00
9d45a3760f
Fix types of the various query params dicts, arrays can be included e.g via
2021-07-16 13:11:43 +01:00
5dbd79c729
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/querystring
...
Conflicts:
package.json
src/@types/global.d.ts
src/components/views/elements/AppTile.js
src/utils/HostingLink.js
yarn.lock
2021-07-16 12:47:33 +01:00
b55f69a74c
Merge pull request #6374 from matrix-org/copy-room
...
Add "Copy Link" to room context menu
2021-07-16 11:14:00 +01:00
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
685b59235d
Make error message consistent with menu title
2021-07-16 09:24:46 +01:00
329f1c9d6a
Update src/components/views/rooms/RoomTile.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com >
2021-07-16 09:22:17 +01:00
191591e807
Make the critical sections of the RLS synchronous to avoid needing to mutex everything
2021-07-16 09:15:56 +01:00
ff80bbc4a5
Move copy link to be before settings
2021-07-16 09:10:20 +01:00
a1c658f187
Set Menu icon to link
2021-07-16 09:07:52 +01:00
7464900f95
Change menu label to Copy Link
2021-07-16 09:05:01 +01:00
2690bb56f9
Remove code we don't seem to need
2021-07-15 13:39:54 -06:00
1437188282
Also move effects handling from event to Room.timeline to wake up less
2021-07-15 18:02:02 +01:00
b0053f36d3
Fix instances of event.sender being read for just the userId - this field may not be set in time
2021-07-15 17:43:24 +01:00
54bfe8ec1e
Migrate Welcome to TypeScript
2021-07-15 15:49:18 +02:00
3b5266071e
Migrate LanguageSelector to TypeScript
2021-07-15 15:44:44 +02:00
8ef9c3dfeb
Migrate CountryDropdown to TypeScript
2021-07-15 15:42:11 +02:00
c6dd9bc526
Migrate CompleteSecurityBody to TypeScript
2021-07-15 15:32:24 +02:00
1f9b423bac
Migrate CaptchaForm to TypeScript
2021-07-15 15:30:58 +02:00
e495cbce37
Migrate AuthPage to TypeScript
2021-07-15 15:22:34 +02:00
13c5adbb6c
Migrate AuthHeaderLogo to TypeScript
2021-07-15 15:22:02 +02:00
5783a38207
Migrate AuthHeader to TypeScript
2021-07-15 15:21:33 +02:00
59316e4820
Migrate AuthFooter to TypeScript
2021-07-15 15:20:43 +02:00
7dbff52aa4
Migrate AuthBody to TypeScript
2021-07-15 15:19:48 +02:00
88da0f4dcf
Give audio and video replies an icon
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com >
2021-07-15 15:17:41 +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
Germain Souquet