Commit graph

224 commits

Author SHA1 Message Date
Michael Telatynski
5ccd02dd6e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/eslint1
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/messages/MImageBody.tsx
2021-07-23 10:42:46 +01:00
Michael Telatynski
f5630acea7 Adhere to better eslint rules 2021-07-23 10:35:10 +01:00
Michael Telatynski
390b05617c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.tsx
	src/components/views/dialogs/RoomUpgradeDialog.tsx
	src/components/views/dialogs/RoomUpgradeWarningDialog.tsx
	src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx
2021-07-21 10:46:41 +01:00
Michael Telatynski
ce78cdf4ad Conform to new react and typescript eslint rules 2021-07-19 22:43:11 +01: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
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
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
David Baker
8bbb768825 Convert RoomHeader to TS
Also add a type of OOBData... possibly this should be in the js-sdk,
but threepid invites themselves have a type in react-sdk so it can
live alongside it I guess (also I'm not entirely sure we actually
use it anymore...)
2021-07-01 19:54:05 +01:00
J. Ryan Stinnett
ae0a8b8da4 Auto-fix lint errors 2021-06-29 13:11:58 +01:00
Michael Telatynski
058cbbbd0c Fix imports 2021-06-18 16:13:55 +01:00
Robin Townsend
1e574307d0 Cache lowBandwidth setting to speed up BaseAvatar
Signed-off-by: Robin Townsend <robin@robin.town>
2021-06-06 23:08:47 -04:00
Germain Souquet
80bd130421 Prevent DecoratedRoomAvatar to update its state for the same value 2021-05-25 16:58:23 +01:00
Michael Telatynski
f6e8d38b87 Remove redundant tag prop 2021-05-13 14:23:10 +01:00
Nolan Darilek
006aa2d5b9 Catch another instance of unlabeled avatars.
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2021-05-11 09:39:06 -05:00
Michael Telatynski
915f8b3c9c Scale all mxc thumbs using device pixel ratio for hidpi
as we are notoriously bad at doing it everywhere we ought to, like the TopLeftMenu avatar
2021-04-26 18:25:49 +01:00
Šimon Brandner
e1446f01e4
Make ImageView static
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-13 08:07:17 +02:00
Nolan Darilek
e5d5e1cce2 Label unlabeled avatar button in event panel.
Signed-off-by: Nolan Darilek <nolan@thewordnerd.info>
2021-03-23 10:00:34 -05:00
Travis Ralston
af9f17219b Fix MemberAvatar crash from EventTilePreview 2021-03-10 12:32:18 -07:00
Travis Ralston
125aef24b9 Convert edge cases of MXC URI conversion to new customisation endpoint 2021-03-10 12:32:18 -07:00
Travis Ralston
4688c887c4 Fix GroupAvatar crash
When we don't have an avatar we shouldn't explode.
2021-03-10 12:32:18 -07:00
Travis Ralston
2a40bc87cc Fix ResizeMethod usage 2021-03-10 12:32:18 -07:00
Travis Ralston
533c9fed64 Appease the linter 2021-03-10 12:32:18 -07:00
Travis Ralston
fa5d98c319 Convert cases of getHttpUriForMxc to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
1ac12479ca Convert cases of mxcUrlToHttp to new media customisation 2021-03-10 12:32:18 -07:00
Travis Ralston
3e189d2728 Batch of views getting replaceableComponent decorators 2021-03-08 20:23:29 -07:00
Michael Telatynski
f21aedc6cf Add Space Panel with Room List filtering 2021-02-26 10:41:26 +00:00
Michael Telatynski
354925c2c8 Improve TS definitions 2021-02-18 15:16:07 +00:00
David Baker
41e885dd67 Merge remote-tracking branch 'origin/develop' into dbkr/new_look_callview 2020-11-18 14:28:03 +00:00
Michael Telatynski
75888fb7b6 Fix BaseAvatar sometimes messing up and duplicating the url 2020-11-13 00:16:58 +00:00
David Baker
c921567831 WIP: the new call views work now
just need to add the buttons and then get rid of the status bar
2020-11-12 18:09:56 +00:00
Michael Telatynski
664079a127 Use MiniAvatarUploader for the new NewRoomIntro component 2020-11-05 15:50:42 +00:00
Michael Telatynski
744a4abd1c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/widgets 2020-10-19 13:08:17 +01:00
Michael Telatynski
20cc3911ed switch form global to window
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 18:48:02 +01:00
Michael Telatynski
ba21c6ed36 Iterate on Widget icons and resizing handles
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-13 15:56:53 +01:00
Michael Telatynski
7820f9c28a Switch to WidgetAvatar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-12 13:16:55 +01:00
Michael Telatynski
f945155d04 Convert UserInfo to Typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-29 10:10:32 +01:00
Michael Telatynski
c7e40d0751 Fix MemberAvatar props interface 2020-09-03 15:05:10 +01:00
Michael Telatynski
9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01:00
Michael Telatynski
634f7ba938
Merge pull request #5142 from matrix-org/t3chguy/hooks/base-avatar
BaseAvatar avoid initial render with default avatar
2020-08-25 09:02:57 +01:00
Michael Telatynski
186374a950 BaseAvatar avoid initial render with default avatar 2020-08-24 21:08:07 +01:00
Heiko Carrasco
9193c81008
Fix image avatar view for 1:1 rooms
Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
2020-08-21 11:44:47 +02:00
Travis Ralston
96087d61f6 Convert feature setting usages to regular settings 2020-08-17 13:12:18 -06:00
Michael Telatynski
4ec602b960 Make cutout in the decorated room avatar transparent rather than fixed 2020-08-14 10:20:59 +01:00
Michael Telatynski
ff8f1af01e
Merge pull request #5037 from matrix-org/t3chguy/room-list/14705
Fix BaseAvatar wrongly using Buttons when it needs not
2020-07-23 09:27:20 +01:00
Michael Telatynski
6546f98e18 Fix BaseAvatar wrongly using Buttons when it needs not
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-22 20:01:14 +01:00
Travis Ralston
c9da1e1874 Remove even more tags from the notification state fetching for a room 2020-07-21 20:58:59 -06:00
Michael Telatynski
c94c937b31 Fix Room Tile Icon to not ignore DMs in other tags
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-16 12:33:05 +01:00
Michael Telatynski
4d432f23e4 Fix room header timeline and composer alignment
Room header use DecoratedRoomAvatar instead of manual e2eIcon overlay
move e2eIcon next to it instead of private padlock

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-13 23:56:25 +01:00
Jorik Schellekens
71e97177b0
Merge pull request #4957 from matrix-org/joriks/room-list-avatar-aspect-ratio
Stop classname from overwritting baseavatar's
2020-07-13 16:02:06 +01:00