Commit Graph

2384 Commits (9dbc1dbc85cb45e7dc92473dfaa6e0ae95fc1b06)

Author SHA1 Message Date
J. Ryan Stinnett ec4bf0c057
Merge pull request #5219 from matrix-org/jryans/defer-cross-signing-setup
Defer encryption setup until first E2EE room
2020-09-18 10:28:33 +01:00
Michael Telatynski ae44a6d1fa Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15180
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 13:42:27 +01:00
Michael Telatynski d340dd58d1 UI Feature Flag: Registration, Password Reset, Deactivate 2020-09-17 11:55:10 +01:00
Michael Telatynski c11abb74e0 UI Feature Flag: Share dialog QR code and social icons 2020-09-16 16:06:17 +01:00
J. Ryan Stinnett 7a5b0a964f Adjust main encryption toast to reference Secure Backup
This adjusts the main toast to focus on Secure Backup as suggested in designs.

Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett 26b465f1fd Remove room recovery reminder
The Secure Backup toast replaces this with better UX.

Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett 46f37fb969 Create cross-signing keys during authentication
With this change, Element now creates cross-signing keys during auth flows for
password login. For other auth flows like token / SSO, it will not happen until
a cross-signing / secret storage dialog flow as before.
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett 3259ab1f25 Place cross-signing action buttons on a single row
Part of https://github.com/vector-im/element-web/issues/13895
2020-09-16 15:03:06 +01:00
J. Ryan Stinnett 7bd5e3fa31 Move security-related dialogs to a common directory 2020-09-16 15:03:06 +01:00
Travis Ralston b177843e45 Remove defunct "always show encryption icons" setting
It doesn't do anything in practice.

Fixes https://github.com/vector-im/element-web/issues/8725
2020-09-14 22:03:54 -06:00
Travis Ralston 77f8c48dc4
Merge pull request #5195 from matrix-org/travis/iconography-update
Show verification status in the room summary card
2020-09-11 09:12:46 -06:00
J. Ryan Stinnett d53cbecbb1
Merge pull request #5198 from matrix-org/jryans/userinfo-scroll
Fix user info scrolling in new card view
2020-09-11 14:52:06 +01:00
J. Ryan Stinnett e49a657a90 Fix user info scrolling in new card view
Fixes https://github.com/vector-im/element-web/issues/15148
2020-09-11 11:39:58 +01:00
J. Ryan Stinnett cd3aa81eed Fix sticker picker height
Fixes https://github.com/vector-im/element-web/issues/15152
2020-09-11 11:12:56 +01:00
J. Ryan Stinnett e7e6bc93ec
Merge pull request #5182 from matrix-org/jryans/defer-cross-signing-setup
Split up cross-signing and secure backup settings
2020-09-11 09:41:40 +01:00
Travis Ralston 4cb7381d03 Show verification status in the room summary card
Fixes https://github.com/vector-im/element-web/issues/15143

Colours are the same for both light and dark theme.
2020-09-10 13:53:42 -06:00
Michael Telatynski 050319c0cc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump 2020-09-09 17:37:50 +01:00
J. Ryan Stinnett 0219824d6f Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup 2020-09-09 14:13:23 +01:00
Michael Telatynski cef533b83e Update ellipsis svg 2020-09-09 13:09:21 +01:00
Michael Telatynski 8d66dce68d Update copy and use svg for ellipsis 2020-09-09 12:50:48 +01:00
Michael Telatynski c8bc80a3b1 test with delay 2020-09-09 10:07:43 +01:00
Nigel Mansell 421af52e76 Fixed 1px jump upwards on filter room members box
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-08 15:29:16 -04:00
J. Ryan Stinnett bbe2084f66 Add independent set up / reset actions in Settings
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
2020-09-08 18:01:56 +01:00
Michael Telatynski 596060c506 fix alignments and iterate PR 2020-09-08 17:57:08 +01:00
Michael Telatynski 6c7cb473dc finalise colours from Figma 2020-09-08 16:33:26 +01:00
Michael Telatynski 8d14d26e2b do the todos 2020-09-08 16:27:09 +01:00
Michael Telatynski 4a4a8cd611 styling and fix `i` button behaviour 2020-09-08 15:43:40 +01:00
Michael Telatynski 3a99343433 iterate styling 2020-09-08 15:43:40 +01:00
Michael Telatynski ef0843d4ad Iterate to match design 2020-09-08 15:43:40 +01:00
Michael Telatynski 0fe6ce1842 Stage svgs 2020-09-08 15:43:40 +01:00
Michael Telatynski 98b59fb217 Consolidate all the work thus far 2020-09-08 15:43:38 +01:00
Michael Telatynski 31cca5e0f2 Create new right panel cards 2020-09-08 15:42:31 +01:00
Michael Telatynski 89a836100d small css tweaks to closer match the figma 2020-09-08 15:42:31 +01:00
Michael Telatynski 11e349d6c8 Update e2e iconography 2020-09-08 15:42:31 +01:00
J. Ryan Stinnett 2fbb551035 Put backup details in a table 2020-09-08 15:26:59 +01:00
Michael Telatynski 667c129ebc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785
 Conflicts:
	src/components/structures/ScrollPanel.js
	src/components/views/rooms/AppsDrawer.js
2020-09-07 14:33:57 +01:00
Nigel Mansell 590e2b70f9 Merge remote-tracking branch 'upstream/develop' into develop 2020-09-05 16:51:13 -04:00
J. Ryan Stinnett cc2c179a0f Set default text colour for Settings tabs 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett e3f47525e5 Rename backup CSS classes 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett 46bc6b1d14 Rename key backup to secure backup 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett da6cc5c2e9 Tweak Security settings section headers
This brings us slightly closer to the version Design is working from in terms of
section naming.

Prep for https://github.com/vector-im/element-web/issues/13895
2020-09-03 15:41:17 +01:00
Michael Telatynski 243af3c9f2 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785 2020-09-02 09:27:06 +01:00
Nigel Mansell 7550a92df9 Fixed 1px jump upwards on filter room members box
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
2020-09-01 13:58:48 -04:00
Travis Ralston 78d5b87fbc Use a different border variable for compatibility with custom themes 2020-08-31 11:20:28 -06:00
Travis Ralston fdbaddbace Add a simple edit dialog for communities 2020-08-31 10:52:08 -06:00
Travis Ralston 02095389e7 Add structure for mixed prototype UserMenu 2020-08-28 17:03:17 -06:00
Travis Ralston 01b0acbe62 Make the UserMenu echo the current community name 2020-08-28 16:14:08 -06:00
Travis Ralston 0ffa548864 Change the menu button to a chevron
by design request
2020-08-28 15:37:23 -06:00
Travis Ralston e58b514803 Add clarifying text to DM dialog about what is about to happen 2020-08-28 13:22:20 -06:00
Travis Ralston cc2fc911af Minor copy addition to DM dialog for communities prototype 2020-08-28 10:03:27 -06:00