Jaiwanth
d1e3d35d40
Change export bundle filename format, light theme for all exports and import jszip after export cta
2021-09-22 22:17:23 +05:30
Jaiwanth
94e4fb71c1
Merge branch 'develop' into export-conversations
2021-09-22 18:07:01 +05:30
Michael Telatynski
1858c63c4a
Allow options to cascade kicks/bans throughout spaces
2021-09-17 15:34:49 +01:00
Jaiwanth
7207329c15
Apply review suggestions
2021-08-13 23:44:07 +05:30
Šimon Brandner
8b59bf3d18
$tertiary-fg-color -> $tertiary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:29 +02:00
Šimon Brandner
10bc85724a
$secondary-fg-color -> $secondary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:19:26 +02:00
Šimon Brandner
e5fd19c332
$primary-fg-color -> $primary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:18:18 +02:00
Šimon Brandner
9ecd3b03f1
$quaternary-fg-color -> $quaternary-content
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:37 +02:00
Šimon Brandner
2afee596a9
$primary-bg-color -> $background
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-08-12 17:17:34 +02:00
Jaiwanth
e88edba650
Merge branch 'develop' into export-conversations
2021-08-12 17:10:13 +05:30
Michael Telatynski
9d3569a577
Iterate PR based on feedback
2021-08-12 10:58:56 +01:00
Michael Telatynski
54d85a3864
Iterate PR based on feedback
2021-08-11 16:32:48 +01:00
Michael Telatynski
f7818e0169
iterate PR based on feedback
2021-08-06 12:05:14 +01:00
Michael Telatynski
a6e5112be0
Offer a way to create a space based on existing community
2021-08-04 10:37:35 +01:00
Jaiwanth
17e9cf4d2a
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-30 12:17:31 +05:30
Michael Telatynski
94af6db201
Merge pull request #6424 from matrix-org/t3chguy/fix/18071
2021-07-29 15:57:26 +01:00
Michael Telatynski
3ee8f607c0
Switch dropdown out for radio interaction when leaving space
2021-07-29 15:50:18 +01:00
Michael Telatynski
493cd01ed3
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18071
...
Conflicts:
res/css/views/dialogs/_AddExistingToSpaceDialog.scss
src/utils/space.tsx
2021-07-29 15:22:52 +01:00
Michael Telatynski
efd8a2f9b0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18096
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
src/components/views/spaces/SpaceCreateMenu.tsx
src/i18n/strings/en_EN.json
2021-07-29 15:16:53 +01:00
Michael Telatynski
40493634ae
Iterate PR
2021-07-28 19:23:33 +01:00
Michael Telatynski
5d9e421de0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
2021-07-28 17:58:34 +01:00
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
39d9ec3ced
Merge branch 'develop' into t3chguy/fix/18071
2021-07-27 15:02:59 +01:00
Jaiwanth
b91309be82
Apply suggestions from review
2021-07-26 23:40:27 +05:30
Michael Telatynski
2114e854f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091
...
Conflicts:
src/components/structures/SpaceRoomView.tsx
2021-07-26 12:36:00 +01:00
Jaiwanth
06d84a16d0
Delint
2021-07-26 12:58:17 +05:30
Jaiwanth
30a64a1b5a
Gray out and hide some options during export
2021-07-26 12:41:36 +05:30
Jaiwanth
b04bfeda33
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into export-conversations
2021-07-26 00:18:56 +05:30
Jaiwanth
3d4d1d32d9
Modify design according to the design team
2021-07-26 00:09:59 +05:30
Michael Telatynski
b89434fcbc
avoid abusing spans because you're too lazy to give things a class
2021-07-23 16:03:15 +01: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
Michael Telatynski
010baabfe6
Improve subspaces and some utilities around room/space creation
2021-07-23 08:46:20 +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
880dc26847
don't force height if the height can't change (no children edge)
2021-07-21 10:39:04 +01:00
Michael Telatynski
1b2d70d816
Prompt user to leave rooms/subspaces in a space when leaving space
2021-07-21 09:57:10 +01:00
Jaiwanth
fe2cac56f9
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-19 12:57:27 +05:30
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
Jaiwanth
6a4e2672f6
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-07-10 19:18:01 +05:30
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
Jaiwanth
637e3afa48
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into export-conversations
2021-06-29 11:31:30 +05:30
Jaiwanth
025a7eb9a5
Iterate PR
2021-06-29 10:36:24 +05:30
Michael Telatynski
56514d51a6
Fix tiny scrollbar dot on chrome/electron in Forward Dialog
2021-06-28 15:37:28 +01:00
Jaiwanth
e505646f21
Finish dialog implementation of export settings
2021-06-26 21:54:10 +05:30
Š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
Michael Telatynski
607ca17971
Iterate beta feedback dialog
2021-05-12 16:11:38 +01:00
Michael Telatynski
7396ce76e5
Tweak the feedbacks a tad
2021-05-11 17:30:33 +01:00
Robin Townsend
7efbd2d930
Hide unencrypted badge from ForwardDialog preview
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:57:47 -04:00
Robin Townsend
503301aa89
Make rooms in ForwardDialog clickable
...
…so that you can jump to a room easily once you've forwarded a message
there.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 13:00:06 -04:00
Robin Townsend
bfba2b0b6f
Push ForwardDialog scrollbar into the gutter
...
…to give more space between it and the buttons.
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-10 11:16:51 -04:00
Robin Townsend
b9b237fc9a
Replace forwarding UI with dialog
...
Replaces the old forwarding UI with a dialog based on designs from
https://github.com/vector-im/element-web/issues/14690 .
Signed-off-by: Robin Townsend <robin@robin.town>
2021-05-08 21:11:06 -04:00
Michael Telatynski
70087b30bf
Add disclaimer about subspaces being experimental in add existing dialog
2021-05-05 17:53:31 +01:00
Michael Telatynski
acce9a4548
Fix rounded progress bars
2021-05-05 11:50:55 +01:00
Michael Telatynski
07f5b6e8c4
Add retry mechanism and progress bar to add existing to space dialog
2021-05-05 11:45:12 +01:00
Michael Telatynski
8656212eb9
Space creation prompt user to add existing rooms instead of creating new ones
2021-04-26 12:41:04 +01:00
Robin Townsend
3d7842d696
Remove old FormButton CSS
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:25:04 -04:00
Robin Townsend
0f84b3dff3
Align checkboxes with names in add rooms to space dialog
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:25:04 -04:00
Robin Townsend
024cf7f66c
Cut off long names in add rooms to space dialog
...
Signed-off-by: Robin Townsend <robin@robin.town>
2021-04-23 10:24:50 -04:00
Šimon Brandner
910a3e5f31
A little nicer spacing
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 20:59:54 +02:00
Šimon Brandner
b52d6e3d97
A tiny change to make the dialog a little nicer
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-04-19 20:52:40 +02:00
Travis Ralston
262475f96e
Add a button to reset personal encryption state during login
2021-03-30 15:37:06 -06:00
Michael Telatynski
6e0ab86168
Small usability tweaks to the add existing to space dialog
2021-03-24 14:10:26 +00:00
Michael Telatynski
fb46815b6a
Spaces move away from Form Buttons
2021-03-24 13:15:31 +00:00
Jason Robinson
f2d2a048e1
Ensure HostSignupDialog border colour matches light theme
...
Ensure dialog borders are always white as the HostSignupDialog
does not yet support dark mode or theming in general.
In the future we might want to pass the theme to the called
iframe, should some hosting provider have that need.
2021-03-04 11:07:14 +02:00
Michael Telatynski
e479edd47a
Add an add existing room to space CTA to Space View
2021-03-02 13:34:53 +00:00
Michael Telatynski
ab4b7b73ea
Add a basic Space Settings view
2021-03-02 13:26:00 +00:00
Travis Ralston
10b0051c02
Appease the linter
2021-02-18 15:30:03 -07:00
Travis Ralston
52c73a7a58
Add developer tool to explore and edit settings
2021-02-18 14:56:19 -07:00
Jason Robinson
538272a827
Tweak the dialog dimensions
...
Make height/width max (as per design wish) and
actual based on viewport.
2021-02-10 15:13:01 +02:00
Jason Robinson
c92a930d0a
Fix positioning of minimize action and add titles
2021-02-09 12:40:12 +02:00
Jason Robinson
3ed6f1fe5d
Fix maximise and minimise icon references
2021-02-09 12:22:58 +02:00
Jason Robinson
03fe0f1f17
s not z
2021-02-04 23:17:48 +02:00
Jason Robinson
f5f8050172
Add minimize button to HostSignupDialog.tsx
2021-02-04 23:09:58 +02:00
Jason Robinson
6ccce7142c
Merge branch 'develop' into jaywink/hosting-provider-iframe-minimize-wip
2021-02-03 22:35:22 +02:00
Jason Robinson
3901cd9c72
WIP
2021-01-15 17:02:28 +02:00
Jason Robinson
90a1c5a267
WIP
2021-01-15 15:57:14 +02:00
Jason Robinson
e80dba9414
WIP
2021-01-15 15:32:30 +02:00
Jason Robinson
d4a58bdb2a
WIP minimize
2021-01-14 11:53:20 +02:00
Jason Robinson
3da5049dc7
WIP minimize
2021-01-12 17:08:42 +02:00
Jason Robinson
e6605441aa
WIP minimize
2021-01-12 14:08:09 +02:00
Jason Robinson
e8c716f33e
First stage of host signup flow now sits here
...
Need to make things configurable, image and text for the first step should be configurable.
Also missing privacy related words, though they should be configurable too.
2021-01-11 15:47:21 +02:00
Jason Robinson
5f84371038
Update some copyrights
2021-01-05 14:29:48 +02:00
Jason Robinson
bb53ae8038
Rename Element Pro -> Host Signup
2021-01-04 16:05:49 +02:00
Jason Robinson
7a358b1ca3
Rename components to be less EMS specific
2020-12-28 11:21:42 +02:00
Jason Robinson
5aa24b97cd
Merge remote-tracking branch 'origin/develop' into jaywink/elementPro
2020-12-16 14:45:16 +02:00
Jason Robinson
db370f218e
Rename also _HostingSignupDialog.scss
2020-12-15 10:53:59 +02:00
Jason Robinson
cd836be809
Rename everything HostingSignup -> EMSElementPro
...
This setup flow ended up quite specific due to all the various moving parts.
2020-12-15 10:50:38 +02:00
Will Hunt
8d203043d4
Remove hide/show behaviour
2020-12-14 12:59:59 +00:00
Jason Robinson
5ad9b83870
Fix copyright strings
2020-11-27 15:10:35 +02:00
Jason Robinson
c818a719bf
Try a slightly larger HostingSignupDialog
...
Make HostingSignupBaseDialog larger
2020-11-27 15:10:35 +02:00
Jason Robinson
bdab1faf16
Fix hosting signup dialog height
2020-11-27 15:10:35 +02:00
Jason Robinson
b3b3f5ebeb
Fix HostingSignupDialog layouting inside dialog
2020-11-27 15:10:35 +02:00
Jason Robinson
c7706ac3d5
Add possibility for hosting provider IFrame
...
Add config option hosting_signup_iframe that
will render an action in the UserMenu and ProfileSettings
for setting up a host with some hosting provider
that provides an HTML to do that.
Add iframe for hosting provider signup content
2020-11-27 15:10:35 +02:00
Michael Telatynski
758b47c64d
Replace *ServerConfig and SignInToText with ServerPicker
2020-11-25 09:46:56 +00:00
Michael Telatynski
b1ca1eb3f5
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials
2020-11-24 11:30:51 +00:00
Michael Telatynski
2263280035
Improve no email warning during registration
2020-11-23 10:25:46 +00:00
Travis Ralston
c80b0aff7d
Appease the linter
2020-11-19 12:09:57 -07:00
Travis Ralston
0104164d51
Approximate the design as proposed
2020-11-19 12:06:24 -07:00
Travis Ralston
a212dab84c
Developer design a permissions dialog
2020-11-17 20:38:59 -07:00
Michael Telatynski
3b7b66c856
Change out caption for email invite suggestions and stack vertically
2020-11-03 14:56:06 +00:00
Michael Telatynski
66377eb731
Invite UX tweaks:
...
+ re-focus input field after all interactions
+ change textarea to text input
+ fix margins between things
+ improve keyboard usage with enter/space autofilling
2020-11-03 13:14:35 +00:00
Michael Telatynski
c3a355097d
Initial Countly work
2020-10-29 15:57:16 +00:00
Michael Telatynski
b6fd2a0691
Iterate the Modal Widget Dialog paddings and phishing warning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-10-20 15:05:22 +01:00
Michael Telatynski
00b1a03a3e
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/modal-widgets
...
Conflicts:
src/@types/global.d.ts
src/FromWidgetPostMessageApi.js
src/WidgetMessaging.js
src/widgets/WidgetApi.ts
2020-10-19 19:46:07 +01:00
J. Ryan Stinnett
43ea5de320
Adjust Settings styles
2020-10-07 20:23:34 +01:00
J. Ryan Stinnett
f2b72efe39
Remove various remaining bits of ILAG flows
...
TypeScript helpfully pointed me towards this dead code, which has been floating
around unused for a while. If we want to bring back ILAG in the future, we can
always revive it from history.
2020-10-07 12:53:59 +01:00
Michael Telatynski
13d09df7d7
tidy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-28 11:59:39 +01:00
Michael Telatynski
44bc8fc67e
Initial Modal Widget work tweaks MSC2790
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-25 14:08:27 +01:00