Commit graph

1023 commits

Author SHA1 Message Date
Travis Ralston
189233447b Merge branch 'develop' into t3chguy/fix/15182 2020-09-18 11:06:32 -06:00
Michael Telatynski
5a6ab95f84
Merge pull request #5215 from matrix-org/t3chguy/fix/15179
UI Feature Flag: Disable advanced options and tidy up some copy
2020-09-18 12:34:38 +01:00
Michael Telatynski
9dbc1dbc85 Hide Advanced Appearance Settings
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-09-18 11:34:35 +01:00
Michael Telatynski
687a2e56b2 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15179
 Conflicts:
	src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-18 11:29:38 +01:00
Michael Telatynski
598c982f02 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/15187
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-18 11:14:36 +01:00
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
c904b4f416 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 14:10:51 +01:00
Michael Telatynski
c1cf8db78f Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15181
 Conflicts:
	src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
	src/i18n/strings/en_EN.json
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 13:55:11 +01:00
Michael Telatynski
5bf6697e48 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15178
 Conflicts:
	src/settings/Settings.ts
	src/settings/UIFeature.ts
2020-09-17 13:31:00 +01:00
Michael Telatynski
eda2dee63f UI Feature Flag: 3PIDs 2020-09-17 13:25:18 +01:00
Michael Telatynski
d340dd58d1 UI Feature Flag: Registration, Password Reset, Deactivate 2020-09-17 11:55:10 +01:00
Michael Telatynski
4db9ac16b5
Merge pull request #5211 from matrix-org/t3chguy/fix/15173
Hide Analytics sections if piwik config is not provided
2020-09-16 16:34:55 +01:00
Michael Telatynski
93323febcb undo change 2020-09-16 16:10:24 +01:00
J. Ryan Stinnett
550a53e49c Check cross-signing cached keys when showing setup button 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
0d25f62a9a Tweak diagnostics for session backup key 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
7be27e70c9 Add component key to actions array 2020-09-16 15:03:06 +01:00
J. Ryan Stinnett
685878a101 Clarify diagnostic about keys in storage
Part of https://github.com/vector-im/element-web/issues/13895
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
Michael Telatynski
d3c84e25f5 UI Feature Flag: Identity server 2020-09-16 14:45:34 +01:00
Michael Telatynski
2bea8457e9 UI Feature Flag: Communities 2020-09-16 12:56:40 +01:00
Michael Telatynski
7a448be1dc UI Feature Flag: Disable advanced options and tidy up some copy 2020-09-16 12:14:33 +01:00
Michael Telatynski
f4f94e31d1 UI Feature Flag: Disable integrations entry UI 2020-09-16 11:38:50 +01:00
Michael Telatynski
9cc789756b UI Feature Flag: Hide flair 2020-09-16 11:26:15 +01:00
Michael Telatynski
d990986407 Also hide Privacy heading in settings and fix React Key warning 2020-09-16 10:37:15 +01:00
Michael Telatynski
771ab82598 Hide Analytics sections if piwik config is not provided 2020-09-16 10:29:21 +01:00
Michael Telatynski
6f0f427ef4
Merge pull request #5210 from matrix-org/t3chguy/fix/15172
If no bug_report_endpoint_url, hide rageshaking from the App
2020-09-15 16:23:48 +01:00
Travis Ralston
88115b4f46
Merge pull request #5208 from matrix-org/travis/ui-func/base
Introduce a concept of UI features, using it for URL previews at first
2020-09-15 08:53:48 -06:00
Michael Telatynski
6c166f0560 If no bug_report_endpoint_url, hide rageshaking from the App 2020-09-15 15:49:25 +01:00
Travis Ralston
f4f30a3274 Introduce a concept of UI features, using it for URL previews at first
Fixes https://github.com/vector-im/element-web/issues/15176

This is effectively the base for all of https://github.com/vector-im/element-web/issues/15185
2020-09-14 22:28:02 -06: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
Michael Telatynski
e32cb175cb Fix Bridges tab crashing when the room does not have bridges 2020-09-14 15:44:00 +01:00
J. Ryan Stinnett
6d1b1d9460 Fix linting error 2020-09-09 14:12:36 +01:00
Clemens Zeidler
db61d343f5 Add option to send/edit a message with Ctrl + Enter / Command + Enter
When editing multi-line text this option helps to prevent accidentally
sending a message too early. With this option, Enter just inserts a new
line.

For example, composing programming code in a dev chat becomes much
easier when Enter just inserts a new line instead of sending the
message.

Signed-off-by: Clemens Zeidler <clemens.zeidler@gmail.com>
2020-09-09 19:27:11 +12: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
J. Ryan Stinnett
aae68f7d1a Move 4S status to backup panel
This moves the various 4S status diagnostics to the backup panel and out of the
cross-signing panel. The available actions are unchanged as part of this commit,
but they will be updated next.
2020-09-08 15:26:59 +01:00
J. Ryan Stinnett
2fbb551035 Put backup details in a table 2020-09-08 15:26:59 +01:00
J. Ryan Stinnett
217f145910 Switch to imports in backup panel 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
b484bc5e09 Rearrange backup status to always have advanced 2020-09-04 13:56:28 +01:00
J. Ryan Stinnett
19e9e0137c Reorganise backup panel so feature description is always present
This ensure the feature description is always shown at the top.
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
7b1031d6a6
Merge pull request #5169 from matrix-org/jryans/defer-cross-signing-setup
Prep work for Settings changes with cross-signing deferral
2020-09-04 12:51:25 +01:00
Michael Telatynski
e624ce11b4
Merge pull request #5157 from matrix-org/t3chguy/crc1
Remove create-react-class
2020-09-03 17:21:58 +01:00
J. Ryan Stinnett
4ef3ef40db Change to import 2020-09-03 16:47:56 +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
J. Ryan Stinnett
fb2bde94fa Rename CrossSigningManager to SecurityManager
The file encompasses bits of cross-signing and also secret storage / secure
backup.
2020-09-03 14:50:49 +01:00
J. Ryan Stinnett
7efa9ba77d Fix DOM nesting error in cross-signing panel
The spinner can't be inside a `<p>` element. This also changes to block spinner
to match key backup.
2020-09-03 13:23:50 +01:00
Michael Telatynski
beb77799f6 Respect user preference for whether pills should have an avatar or not 2020-09-02 17:26:23 +01:00
Michael Telatynski
72498df28f Remove create-react-class 2020-08-29 12:14:16 +01:00
Michael Telatynski
9ba33c7f80 Fix eslint ts override tsx matching and delint 2020-08-29 01:11:08 +01:00
J. Ryan Stinnett
a732c55797 Add secret storage readiness checks
This visits all places that were checking for cross-siging readiness and adapts
them to also check for secret storage readiness if needed.

Part of https://github.com/vector-im/element-web/issues/13895
2020-08-25 13:20:15 +01:00
nurjinn jafar
1123545cfa Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676
 Conflicts:
	src/SlashCommands.tsx
	src/i18n/strings/de_DE.json
2020-08-25 11:52:48 +02:00
J. Ryan Stinnett
8e0742b9fe
Merge pull request #5130 from matrix-org/jryans/secure-backup-required
Enforce Secure Backup completion when requested by HS
2020-08-24 17:32:58 +01:00
David Baker
0690c02e0c
Merge pull request #5131 from matrix-org/dbkr/clarify_media_device_id
Add clarifying comment in media device selection
2020-08-20 09:26:27 +01:00
David Baker
d1bca2838f Add clarifying comment in media device selection
Hopefully explain the confusing mismatch.
2020-08-19 19:07:12 +01:00
J. Ryan Stinnett
fed7ebb6bc Hide Delete Backup button when Secure Backup required
If Secure Backup is required by the HS admin, then this hides the Delete Backup
button in Settings to ensure everyone keeps their backup per policy.

Part of https://github.com/vector-im/element-web/issues/14954
2020-08-19 16:23:27 +01:00
nurjinn jafar
4394a20f87 setting added to User Settings -> Preferences -> Timeline as an opt out for users with german translation 2020-08-18 09:56:38 +02:00
Travis Ralston
4f851542ac Implement force state for features like in the proposal 2020-08-17 13:51:41 -06:00
Travis Ralston
eda4e24926 Update LabsUserSettings for new feature behaviour 2020-08-17 13:19:15 -06:00
Travis Ralston
96087d61f6 Convert feature setting usages to regular settings 2020-08-17 13:12:18 -06:00
Jorik Schellekens
0060acbb33
Merge pull request #5056 from matrix-org/joriks/style-fighting
Quick win session 24/07/2020
2020-08-12 15:21:06 +01:00
Michael Telatynski
5c0d332e9d Convert Bridge Settings Tab to Typescript 2020-08-08 11:38:57 +01:00
Michael Telatynski
f784500b1c Fix Bridge Settings Tab 2020-08-08 11:28:44 +01:00
J. Ryan Stinnett
4c1956a3c2 Show master key cache status in Settings 2020-08-06 15:25:33 +01:00
Jorik Schellekens
b871d7e849 Fix room security radios 2020-08-05 13:53:19 +01:00
Jorik Schellekens
271eeeabee Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/style-fighting 2020-08-04 15:04:56 +01:00
J. Ryan Stinnett
ce226ab534 Replace Riot with Element in docs and comments
This only covers the simple cases of references to issues and repos. More
complex areas, such as deployment scripts, will be handled separately.

Part of https://github.com/vector-im/element-web/issues/14864
2020-08-03 18:33:36 +01:00
Travis Ralston
1f7f40736b Fix imports for SettingLevel to point at new file 2020-07-28 11:53:43 -06:00
Jorik Schellekens
f64ef65f97 Use StyledRadioGroup 2020-07-28 17:13:58 +01:00
Jorik Schellekens
447ef63950 Replace old checkboxes 2020-07-27 16:36:31 +01:00
Michael Telatynski
fe0c660fac Put low priority xor toggle back in the room list context menu
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-21 09:50:20 +01:00
Travis Ralston
2b15ba21dd Rename RoomListStore file 2020-07-17 15:11:34 -06:00
Travis Ralston
1810711380 Dismantle usage of the proxy store class 2020-07-17 14:25:09 -06:00
Travis Ralston
c29da883db Convert room list log setting to a real setting
To debug https://github.com/vector-im/riot-web/issues/14554 and https://github.com/vector-im/riot-web/issues/14508
2020-07-16 14:43:43 -06:00
David Baker
7ab1416787
Merge pull request #4986 from matrix-org/dbkr/update_help_link
Update help link
2020-07-15 16:30:03 +01:00
David Baker
7d5f40876e Update help link 2020-07-15 14:31:15 +01:00
David Baker
6e35cd1d0c Update cover photo link 2020-07-15 14:22:58 +01:00
Travis Ralston
cc22be4f1d Update attribution 2020-07-14 15:51:34 -06:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
Jorik Schellekens
3eac852ad0 Change font slider values 2020-07-14 21:27:01 +01:00
Travis Ralston
3a8b3e26ac Fix appearance tab saying the wrong theme is selected
Fixes https://github.com/vector-im/riot-web/issues/14275
2020-07-14 11:53:10 -06:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
Bruno Windels
4fe4788c2e Merge branch 'develop' into element 2020-07-14 14:31:31 +02:00
Jorik Schellekens
59e153e024
Merge branch 'develop' into joriks/delabs-font-scaling 2020-07-13 16:15:52 +01:00
J. Ryan Stinnett
9085627a28 Use brand name from config in all strings 2020-07-10 19:57:01 +01:00
J. Ryan Stinnett
5f78522681 Move the default brand into the config module 2020-07-10 19:57:01 +01:00
Travis Ralston
75dbd5f1d4 Merge branch 'develop' into travis/room-list/enable 2020-07-09 22:28:16 -06:00
Bruno Windels
d90fc57469 Merge branch 'develop' into element 2020-07-09 17:59:56 +02:00
Jorik Schellekens
1033eda7fb Move irc layout option to advanced 2020-07-09 15:54:44 +01:00
Bruno Windels
7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Jorik Schellekens
9dd28a9ce0 semi 2020-07-08 17:02:26 +01:00
Jorik Schellekens
4ae64aff9a lint line length 2020-07-08 16:14:04 +01:00
Jorik Schellekens
b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +01:00
Travis Ralston
a59a8b76a9 Update TODO comments to point to new issue 2020-07-07 14:51:43 -06:00
Bruno Windels
38ff58f8dd remove upload icon 2020-07-07 12:16:16 +02:00
Jorik Schellekens
1e0ff01d50 De labs font-scaling 2020-07-06 15:43:49 +01:00
Michael Telatynski
ae5ab4c394
Merge pull request #4893 from matrix-org/t3chguy/room-list/101
Radio button outline fixes including for new room list context menu
2020-07-03 20:35:17 +01:00
Michael Telatynski
c8bb6f5904 Improve radio outlines for message layout to be more consistent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:48:22 +01:00
Michael Telatynski
5a542281ed Make Styled Radio Button outlines default-off
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-07-03 19:27:45 +01:00
J. Ryan Stinnett
04142a8723 Remove duplicate compact settings, handle device level updates
This removes the duplicate setting for compact layout from the appearance tab,
and leaves the "advanced" one, matching the intention from Design.

This also adds the relevant handling to ensure the device-level setting triggers
an update immediately when changed.

Fixes https://github.com/vector-im/riot-web/issues/14304
2020-07-03 12:06:00 +01:00
Travis Ralston
0868af650a Appease the linter 2020-06-30 19:37:00 -06:00
Travis Ralston
d402808101 Disable use of account-level ordering options in new room list
Fixes https://github.com/vector-im/riot-web/issues/14069

We can't drop them completely for compatibility with the old room list.
2020-06-30 19:31:59 -06:00
David Baker
2247400010
Merge pull request #4847 from matrix-org/dbkr/recovery_key_upload_2
Add file upload button to recovery key input
2020-06-30 18:06:12 +01:00
David Baker
24baf19d65 Set field validity (ie. border colour) correctly
Changes flagInvalid to forceValidity which can force valid as well
as invalid.
2020-06-26 18:50:05 +01:00
Michael Telatynski
cf3c914382 Merge branches 'develop' and 't3chguy/notifications0' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-26 15:35:36 +01:00
Michael Telatynski
46058a17f8 Fix Room Custom Sounds regression
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-26 14:18:38 +01:00
Michael Telatynski
85c5bb3bc3
Merge pull request #4835 from matrix-org/t3chguy/notifications0
More small tweaks in preparation for Notifications rework
2020-06-25 23:34:28 +01:00
Michael Telatynski
ed634a2bde Add StyledRadioGroup to simplify use of StyledRadioButton and use in Appearance Tab
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 16:35:40 +01:00
Jorik Schellekens
a2d53229ea
Merge pull request #4822 from matrix-org/joriks/appearance-tab-compact-to-advanced
Move compact modern layout checkbox to 'advanced'
2020-06-25 14:38:18 +01:00
Michael Telatynski
edd09f66d1 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/notifications0 2020-06-25 08:45:32 +01:00
Michael Telatynski
dc099efb19 make Notifier getSoundForRoom synchronous
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-25 08:43:35 +01:00
Jorik Schellekens
0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
J. Ryan Stinnett
b01015f5c5 Show cross-signing / secret storage reset button in more cases
This exposes the cross-signing / secret storage reset button in more cases to
hopefully give people a better chance of trying again in case something failed
halfway through set up. In particular, any combination of keys existing now
reveals the reset button.

Fixes https://github.com/vector-im/riot-web/issues/13993
2020-06-24 14:30:12 +01:00
Jorik Schellekens
d54676aefe Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/appearance-advanced 2020-06-22 15:35:48 +01:00
Jorik Schellekens
3d7427ccca Fix semicolons 2020-06-22 11:39:11 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced 2020-06-22 11:27:48 +01:00
Jorik Schellekens
37b299412f Fix merge conflicts 2020-06-18 15:47:26 +01:00
Jorik Schellekens
f2440388b1 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 15:37:01 +01:00
Jorik Schellekens
b9fb9aae4a Rename MessagePreview to EventTilePreview 2020-06-18 15:36:23 +01:00
Jorik Schellekens
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +01:00
Jorik Schellekens
291997421b Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/semicolon 2020-06-18 14:54:20 +01:00
David Baker
5b27a570a8
Merge pull request #4790 from matrix-org/revert-4686-dbkr/recovery_keys_over_passphrases
Revert "Use recovery keys over passphrases"
2020-06-18 14:51:22 +01:00
Jorik Schellekens
47a825be7c
Merge branch 'develop' into joriks/appearance-advanced 2020-06-18 14:41:28 +01:00
Jorik Schellekens
05d0309081 Lint a few semicolons 2020-06-18 14:32:43 +01:00
Jorik Schellekens
9760f94ff5 Merge branch 'joriks/font-scaling-message-preview' into joriks/appearance-tab-layout-options 2020-06-18 14:04:31 +01:00
Jorik Schellekens
69969dfee8 Respond to review
- remove all refs to getsdk
- i18n
- some lints
2020-06-18 13:58:35 +01:00
Jorik Schellekens
a579ea95db Lint and i18n 2020-06-18 13:28:24 +01:00
David Baker
54e235b0b9 Remove labs option to cache 'passphrase'
(which actually meant SSSS secrets)

Fixes https://github.com/vector-im/riot-web/issues/1392
2020-06-18 10:42:33 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases" 2020-06-18 09:35:11 +01:00
Jorik Schellekens
2fcf30c1ec
Fix copy '!' 2020-06-17 14:39:44 +01:00
Jorik Schellekens
2192332968 Add layout options to the appearance tab 2020-06-16 17:55:19 +01:00
Jorik Schellekens
17dbb1ac8b Message preview for font slider 2020-06-16 15:41:10 +01:00
Jorik Schellekens
02ccdcb802 Fix field width and add tooltip 2020-06-15 17:42:30 +01:00
Jorik Schellekens
aee9cd51a0 Remove shadowed variable 2020-06-15 16:34:56 +01:00
Jorik Schellekens
edb6bbc6c0 Implement font selection 2020-06-15 15:33:52 +01:00
Jorik Schellekens
94f52c4ee2
Merge pull request #4731 from matrix-org/joriks/radio-buttons
Change theme selector to use new styled radio buttons
2020-06-15 12:51:02 +01:00
David Baker
8ebae4c3b6
Merge pull request #4686 from matrix-org/dbkr/recovery_keys_over_passphrases
Use recovery keys over passphrases
2020-06-15 11:30:30 +01:00
Jorik Schellekens
3dd49cae97 use checkbox for compact layout 2020-06-11 12:29:10 +01:00
Jorik Schellekens
cf392af52f Address design issues and set theme at device level 2020-06-11 12:27:09 +01:00
Jorik Schellekens
0f685eb0e9 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/radio-buttons 2020-06-11 11:03:54 +01:00
Jorik Schellekens
9b623f5b44 fix line indents 2020-06-09 13:38:29 +01:00
Jorik Schellekens
b4bdb23f5f Clean up font scaling appearance 2020-06-08 19:02:36 +01:00
Jorik Schellekens
24cf3d5f05 add key to react list and let selector container wrap 2020-06-08 18:37:36 +01:00
Jorik Schellekens
a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Jorik Schellekens
2fe7c37566 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/font-scaling-unit-change 2020-06-08 13:37:05 +01:00
David Baker
b82a893a79 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-05 16:00:43 +01:00
Jorik Schellekens
bba6767608 Update displayed min and max 2020-06-04 18:00:22 +01:00
Jorik Schellekens
2ec47ecc74 Use different setting flag print expected values 2020-06-04 17:50:56 +01:00
Michael Telatynski
993a545cd2 Profile settings should never show a disambiguated display name
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-06-04 09:50:19 +01:00