Š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
Robin Townsend
8efb30eb07
Merge branch 'develop' into emojibase-updates
2021-07-16 14:38:10 -04:00
Robin Townsend
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
Šimon Brandner
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
Michael Telatynski
9d45a3760f
Fix types of the various query params dicts, arrays can be included e.g via
2021-07-16 13:11:43 +01:00
Michael Telatynski
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
Michael Telatynski
e6007874d9
post-merge fixup
2021-07-16 11:43:06 +01:00
James Salter
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
James Salter
9cb3c71afe
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into copy-room
2021-07-16 09:34:30 +01:00
James Salter
685b59235d
Make error message consistent with menu title
2021-07-16 09:24:46 +01:00
James Salter
329f1c9d6a
Update src/components/views/rooms/RoomTile.tsx
...
Co-authored-by: Michael Telatynski <7t3chguy@gmail.com>
2021-07-16 09:22:17 +01:00
Šimon Brandner
651f19fb9b
Merge remote-tracking branch 'upstream/develop' into feature/hidden-rrs
2021-07-16 10:21:30 +02:00
Michael Telatynski
191591e807
Make the critical sections of the RLS synchronous to avoid needing to mutex everything
2021-07-16 09:15:56 +01:00
James Salter
ff80bbc4a5
Move copy link to be before settings
2021-07-16 09:10:20 +01:00
James Salter
a1c658f187
Set Menu icon to link
2021-07-16 09:07:52 +01:00
James Salter
7464900f95
Change menu label to Copy Link
2021-07-16 09:05:01 +01:00
Travis Ralston
2690bb56f9
Remove code we don't seem to need
2021-07-15 13:39:54 -06:00
Michael Telatynski
1437188282
Also move effects handling from event
to Room.timeline
to wake up less
2021-07-15 18:02:02 +01:00
Michael Telatynski
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
Germain Souquet
54bfe8ec1e
Migrate Welcome to TypeScript
2021-07-15 15:49:18 +02:00
Germain Souquet
3b5266071e
Migrate LanguageSelector to TypeScript
2021-07-15 15:44:44 +02:00
Germain Souquet
8ef9c3dfeb
Migrate CountryDropdown to TypeScript
2021-07-15 15:42:11 +02:00
Germain Souquet
c6dd9bc526
Migrate CompleteSecurityBody to TypeScript
2021-07-15 15:32:24 +02:00
Germain Souquet
1f9b423bac
Migrate CaptchaForm to TypeScript
2021-07-15 15:30:58 +02:00
Germain Souquet
e495cbce37
Migrate AuthPage to TypeScript
2021-07-15 15:22:34 +02:00
Germain Souquet
13c5adbb6c
Migrate AuthHeaderLogo to TypeScript
2021-07-15 15:22:02 +02:00
Germain Souquet
5783a38207
Migrate AuthHeader to TypeScript
2021-07-15 15:21:33 +02:00
Germain Souquet
59316e4820
Migrate AuthFooter to TypeScript
2021-07-15 15:20:43 +02:00
Germain Souquet
7dbff52aa4
Migrate AuthBody to TypeScript
2021-07-15 15:19:48 +02:00
Šimon Brandner
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
Šimon Brandner
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
Michael Telatynski
ea20e041b1
Merge pull request #6382 from matrix-org/t3chguy/console
2021-07-15 13:50:13 +01:00
Michael Telatynski
20e0356eb1
why do my IDE be dumb
2021-07-15 12:25:26 +01:00
Michael Telatynski
7c3c04d340
Fix instances of setState calls after unmount
2021-07-15 12:10:54 +01:00
Michael Telatynski
e9d56d4f13
Fix possible uncaught exception for getUrlPreview which would cause 0 url previews if one url was faulty
2021-07-15 12:10:01 +01:00
Michael Telatynski
1eaf6dd4ed
Improve TS in SenderProfile
2021-07-15 11:49:55 +01:00
Michael Telatynski
b8ac40ae55
Fix React missing key error
2021-07-15 11:49:44 +01:00
Michael Telatynski
50b6c5c557
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/spacesperf
...
Conflicts:
src/components/views/dialogs/InviteDialog.tsx
2021-07-15 10:19:04 +01:00
Michael Telatynski
dcb9b9b777
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
...
Conflicts:
src/components/views/elements/MiniAvatarUploader.tsx
src/components/views/spaces/SpaceSettingsVisibilityTab.tsx
src/i18n/strings/en_EN.json
src/settings/handlers/RoomSettingsHandler.ts
src/stores/SpaceStore.tsx
2021-07-15 10:04:48 +01:00
Andrew Morgan
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
Michael Telatynski
80f9793c73
only show space beta tweaks if you have the beta enabled as they do nothing otherwise
2021-07-15 08:29:50 +01:00
Michael Telatynski
90d380c8ae
Cache value of feature_spaces* flags as they cause page refresh so are immutable
2021-07-15 08:26:49 +01:00
Šimon Brandner
18343d839c
Show MSC2285 only if supported by server
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-15 09:23:15 +02:00
Germain
c7c29f2119
Merge pull request #6365 from psrpinto/fix/naming
2021-07-15 08:07:03 +01:00
Michael Telatynski
4084a11847
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/ts/c3
2021-07-14 17:52:32 +01:00
Michael Telatynski
57f9b819b5
Merge pull request #6345 from matrix-org/t3chguy/ts/c1
2021-07-14 17:19:07 +01:00
David Baker
291723107a
Merge pull request #6375 from matrix-org/dbkr/fix_user_type_import
...
Fix 'User' type import
2021-07-14 16:49:41 +01:00
Germain Souquet
51c5094ca4
Merge branch 'develop' into gsouquet/message-bubbles-4635
2021-07-14 17:47:22 +02:00