PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
35808 commits 1 branch 0 tags 338 MiB
Commit graph

349 commits

Author SHA1 Message Date
Michael Telatynski
6123ccb2eb Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096 2021-07-28 17:45:15 +01:00
Travis Ralston
9707797d45
Merge pull request #6272 from SimonBrandner/fix/explicit-font/14163 
Don't set `font-family` explicitly
 2021-07-27 11:04:23 -06:00
Michael Telatynski
7ccc429bea Change spaces beta feedback to not be so beta-centric 2021-07-23 15:47:11 +01:00
Michael Telatynski
358a4e5d3f
Merge pull request #6212 from matrix-org/t3chguy/fix/17686 2021-07-23 09:09:17 +01:00
Germain Souquet
8a9d89ae85 Fix event tile cut off in share preview 2021-07-22 15:05:44 +02:00
Michael Telatynski
d147aaa984 delint and fix min-height issue 2021-07-21 11:27:36 +01:00
Michael Telatynski
fd64d37305 Add iconography to Create Room Dialog dropdown 
Remove unused old stale feather-customised/globe.svg
 2021-07-21 11:20:41 +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
eb9f4c609a Make CreateRoomDialog capable of creating restricted rooms in spaces 2021-07-06 10:10:47 +01:00
Michael Telatynski
c5ca98a3ad Iterate SecurityRoomSettingsTab and ManageRestrictedJoinRuleDialog 2021-07-06 10:10:25 +01:00
Michael Telatynski
1b25ab930e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686 
 Conflicts:
	src/components/views/dialogs/AddExistingToSpaceDialog.tsx
 2021-07-05 13:06:22 +01:00
David Baker
0cee0db9df Fix icon size in passphrase prompt 2021-07-02 20:38:07 +01:00
Michael Telatynski
e8f0412fe3 Add way to manage Restricted join rule in Room Settings 2021-07-02 14:51:55 +01:00
Michael Telatynski
56514d51a6 Fix tiny scrollbar dot on chrome/electron in Forward Dialog 2021-06-28 15:37:28 +01:00
Šimon Brandner
ffc6f96d45
Remove explicitly set font-family 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 09:12:45 +02:00
Šimon Brandner
fbe3eb7726
Remove unused class 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
 2021-06-26 09:00:42 +02:00
Michael Telatynski
6d3e7730ef Fix two PRs duplicating the css attribute 2021-06-24 11:40:49 +01:00
Michael Telatynski
71414904fc
Merge pull request #6201 from matrix-org/t3chguy/fix/15051 2021-06-24 11:20:12 +01:00
Michael Telatynski
26d8c4d2e6 Improve design of the multi inviter error dialog 2021-06-24 10:03:32 +01:00
Michael Telatynski
0e2f617d94 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15051 2021-06-24 09:33:39 +01:00
Michael Telatynski
47be728eb2 Fix invite dialog being cut off when it has limited results 2021-06-24 09:21:52 +01:00
Michael Telatynski
384bb3af2e Fix layout regression in the invite dialog for few results 2021-06-16 10:37:34 +01:00
Michael Telatynski
83c30b2280 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17244 
 Conflicts:
	src/components/views/spaces/SpaceCreateMenu.tsx
 2021-06-15 12:24:26 +01:00
Michael Telatynski
539465ecb4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 
 Conflicts:
	src/components/views/dialogs/InviteDialog.tsx
 2021-06-14 22:22:30 +01:00
Germain Souquet
15132074e2 Restore copy button icon when sharing permalink 2021-06-09 13:44:31 +01:00
Michael Telatynski
f34a2e61bc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-06-08 16:54:49 +01:00
Michael Telatynski
90bb7c1482 Switch Space Settings for a tabbed view with a bunch more settings exposed 2021-06-08 16:33:47 +01:00
Robin Townsend
372f24ff99 Hide download links from forward dialog preview 
since trying to interact with them is pointless.

Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-07 19:19:14 -04:00
Robin Townsend
e891d18fa2 Add my email to my copyright notices 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-05 21:41:28 -04:00
Michael Telatynski
0c97d90fb9 Iterate PR based on feedback 2021-06-03 16:44:28 +01:00
Robin Townsend
8efbdd0406 Match forward dialog send failed indicator color with button 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-06-01 17:56:46 -04:00
Michael Telatynski
caaef63077 delint1 2021-05-28 13:11:48 +01:00
Michael Telatynski
36e43270ca
Apply suggestions from code review 2021-05-28 13:08:05 +01:00
Michael Telatynski
e41645795c Merge branch 't3chguy/fix/17365' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17365 2021-05-28 13:05:41 +01:00
Nique Woodhouse
ea26393709 Styling amends to accommodate the invite dialog footer 2021-05-28 13:00:18 +01:00
Michael Telatynski
2c750fcb7a Fix overflow issue in suggestion tiles 2021-05-28 12:48:12 +01:00
Michael Telatynski
f75fb3b349 Add footer and privacy note to the start dm dialog 2021-05-27 15:51:25 +01:00
Robin Townsend
400917623c Make myself the copyright holder for forward dialog code 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-24 08:33:28 -04:00
Robin Townsend
7a04502151 Iterate on forward dialog design feedback 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-21 12:41:29 -04:00
Robin Townsend
6cb6c7f3d0 Combine forward dialog room and DM lists 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-19 13:33:48 -04:00
Robin Townsend
83224dc7b6 Ensure forward list room decorations are aligned 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-19 13:32:27 -04:00
Robin Townsend
e798b36f1d Decorate forward dialog room avatars 
Signed-off-by: Robin Townsend <robin@robin.town>
 2021-05-16 08:39:22 -04:00
Robin Townsend
64e828d069 Merge branch 'develop' into improved-forwarding-ui 2021-05-16 08:13:59 -04:00
Michael Telatynski
c7c61bf26a
Merge pull request #6030 from matrix-org/t3chguy/fix/17276 
Decorate room avatars with publicity in add existing to space flow
 2021-05-14 11:23:46 +01:00
Michael Telatynski
4f55ac1fa6
Merge pull request #6025 from matrix-org/t3chguy/fix/16674 
Improve Spaces "Just Me" wizard
 2021-05-14 10:58:55 +01:00
Michael Telatynski
5feb9e85d7
Merge branch 'develop' into t3chguy/fix/16622 2021-05-13 16:12:42 +01:00
Michael Telatynski
6aa477f0f5 Decorate room avatars with publicity in add existing to space flow 2021-05-13 14:23:28 +01:00
Michael Telatynski
423c515708 Consolidate AddExistingToSpace between Dialog and Just Me integrated flow 2021-05-13 09:46:45 +01:00
Michael Telatynski
565e41c3df Extract UntrustedDeviceDialog and fix e2ee icon 2021-05-12 17:04:24 +01:00