bdeb788be9
Merge pull request #4512 from matrix-org/t3chguy/cherry-pick/4
...
Fix internal link styling in Security Settings
2020-04-29 10:59:24 +01:00
c10969f520
enable encryption when NOT inviting 3pids
2020-04-29 11:46:04 +02:00
a8205d21f1
targets can also contain RoomMember, so take the positive case rather
2020-04-29 11:46:04 +02:00
be13e86b09
dont enable e2ee when inviting a 3pid
2020-04-29 11:46:04 +02:00
246c70c6a1
Fix internal link styling in Security Settings
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-29 10:29:32 +01:00
582747d2ed
Merge pull request #4499 from matrix-org/dbkr/link_from_settings_to_userprofile_rel
...
Add a link from settings / devices to your user profile
2020-04-27 17:28:46 +01:00
63d2d128c5
Lint
2020-04-27 16:29:28 +01:00
ef1e40c839
Update to (almost) match design
2020-04-27 16:29:17 +01:00
0a89813de1
Add a link from settings / devices to your user profile
...
Temporarily until you can verify devices in settings
Fixes https://github.com/vector-im/riot-web/issues/13401
2020-04-27 16:29:11 +01:00
4e0f0bb299
Merge pull request #4490 from matrix-org/dbkr/setup_encryption_dialog_icon_rel
...
Make icon change in SetupEncryptionDialog
2020-04-24 18:56:22 +01:00
b3fac7c2cb
Move store subscribe to didmount
2020-04-24 17:40:21 +01:00
c684898ba0
Make icon change in SetupEncryptionDialog
...
Fixes https://github.com/vector-im/riot-web/issues/13368
2020-04-24 17:40:14 +01:00
353810ce63
Remove invite only padlocks feature flag
...
Fixes https://github.com/vector-im/riot-web/issues/13366
Only known issue on this is https://github.com/vector-im/riot-web/issues/12148
This has been pre-approved by Product.
2020-04-24 10:06:34 -06:00
949b916091
Fix recovery link on login verification flow
...
This fixes the recovery link to go to the right place.
Fixes https://github.com/vector-im/riot-web/issues/13346
2020-04-23 18:18:25 +01:00
9b4172bf85
Merge pull request #4468 from matrix-org/travis/rel-seshat-enable
...
Take encrypted message search out of labs for release
2020-04-23 10:22:04 +01:00
89860100ae
Update login security copy and design to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 23:09:17 +01:00
63de2783c3
Fix i18n of SSO UIA copy in Deactivate Account Dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 15:34:32 -06:00
ab7d7becd7
Match settings paragraph style in all cases
2020-04-22 11:14:12 -06:00
50059373d2
Appease the linter
2020-04-22 11:14:03 -06:00
475cea8b8a
Take encrypted message search out of labs
...
Fixes https://github.com/vector-im/riot-web/issues/13262
This is part of the cross-signing shipping master plan. Known issues relating to this feature are:
* https://github.com/vector-im/riot-web/issues/12896
* https://github.com/vector-im/riot-web/issues/12385
* https://github.com/vector-im/riot-web/issues/11831
* https://github.com/vector-im/riot-web/issues/11155
In theory, these are issues we're comfortable with shipping as we're already enabling it by default. This just makes it easier on everyone by removing the flag (making it still enabled by default).
2020-04-22 11:13:21 -06:00
84552048e6
Merge pull request #4457 from matrix-org/bwindels/waitforxsignkeystoverify-rc
...
Fix: wait until cross-signing keys are fetched to show verify button
2020-04-22 08:12:52 +00:00
d842944f61
wait until cross-signing keys are fetched to show verify button
2020-04-21 18:42:09 +02:00
45b6b95d44
Appease the linter
2020-04-16 11:27:09 -06:00
2ffb5be5cd
Remove UI to change the cross-signing setting
2020-04-16 11:26:56 -06:00
2d395d8dd1
Convert cross-signing feature flag to setting
...
This is intended as a temporary measure until we're comfortable with removing the flag entirely.
2020-04-16 11:26:42 -06:00
d4b15da70a
Fixxy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
da5c8b5657
further tweaks by Matthew
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
7236397e5f
Replace `Verify this session` and `Complete security`
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
498ac2e0fc
Copy tweaks with Nad
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
d17e54c1cf
Use `recovery passphrase` and `recovery key` everywhere
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 15:49:17 +01:00
6723cca48e
ensure twemoji font is loaded when showing SAS emojis
2020-04-16 11:36:57 +02:00
f4c4fe7d12
Merge pull request #4413 from matrix-org/t3chguy/wait4initialsync
...
Login block on initialSync with spinners
2020-04-15 16:17:13 +01:00
81f501e844
disable language dropdown too
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:19:47 +01:00
7efbae0470
Merge pull request #4408 from matrix-org/t3chguy/fix_network_dropdown_scrolling
...
Allow network dropdown to be scrollable and fix context menu padding calc
2020-04-15 14:08:34 +01:00
ac26719b69
disable password reset button when spinning
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 14:07:37 +01:00
fafe57624c
Merge pull request #4412 from matrix-org/jryans/hide-e2e-info-opt
...
Remove end-to-end message info option when cross-signing is used
2020-04-15 14:07:22 +01:00
8b25223026
fix onLoggedIn getting called twice
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 13:45:12 +01:00
346b2e8588
Login block on initialSync with spinners
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:21:49 +01:00
e9c755e73f
Remove end-to-end message info option when cross-signing is used
...
This end-to-end info dialog repeats info available elsewhere and has not been
updated to make sense for cross-signing, triggers old verification methods, etc.
For now, this hides the option to present a more consistent UI.
Relates to https://github.com/vector-im/riot-web/issues/11752
2020-04-15 10:25:05 +01:00
36fea4d487
Merge pull request #4378 from matrix-org/travis/expanding-widgets
...
Minimize widgets by default
2020-04-14 12:56:10 -06:00
f0a2f5dd4f
Merge pull request #4380 from matrix-org/travis/widget-complaints
...
Add comments to highlight where we'll need m.widget support
2020-04-14 12:55:49 -06:00
769cf1c987
Allow network dropdown to be scrollable and fix context menu window padding calc
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 17:34:39 +01:00
aef6687931
Merge pull request #4406 from matrix-org/bwindels/completesecuritywithoutspinner
...
Fix: don't confuse user with spinner during complete security step
2020-04-14 15:54:44 +00:00
861c449055
Merge pull request #4405 from matrix-org/bwindels/qrcodefix
...
Fix: avoid potential crash during certain verification paths
2020-04-14 15:21:47 +00:00
db09cadb66
remove spinner, change copy, add button placeholder
2020-04-14 17:19:15 +02:00
7fa38933cb
Merge branches 'develop' and 't3chguy/electron-forward-back' of github.com:matrix-org/matrix-react-sdk into t3chguy/electron-forward-back
...
Conflicts:
src/components/structures/LoggedInView.tsx
2020-04-14 15:54:58 +01:00
7b3c34bd12
use js-sdk qr code generation
2020-04-14 16:46:02 +02:00
fc67d1d775
Merge pull request #4398 from matrix-org/t3chguy/liv
...
Convert LoggedInView to an ES6 PureComponent Class & TypeScript
2020-04-14 15:08:04 +01:00
26569dea06
Revert "@replaceableComponent"
...
This reverts commit 50d6551c
2020-04-14 14:59:20 +01:00
50d6551c86
@replaceableComponent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-14 14:50:09 +01:00
Michael Telatynski