9ac4fa92fd
Update (bulk) unverified device toast copy
...
Fixes https://github.com/vector-im/riot-web/issues/13444
2020-04-29 15:31:41 +01:00
eceb8edfbc
Merge pull request #4511 from matrix-org/dbkr/another_round_of_toast
...
Separate toasts for existing & new device verification
2020-04-29 12:09:37 +01:00
4adbfce92d
Merge pull request #4502 from matrix-org/jryans/set-up-button-text
...
Fix set up encryption toast to have use "set up" as action
2020-04-29 10:57:24 +01:00
75c680715f
s/unverified/new/
2020-04-29 10:53:36 +01:00
719faed2ff
Separate toasts for existing & new device verification
...
Separate device verification toasts into ones for devices that were
there when the app loaded and a separate toast for each device that
has appeared since.
Reverts part of https://github.com/matrix-org/matrix-react-sdk/pull/4506
(clicking a device from your own UserInfo now triggers the legacy
verification flow again).
Fixes https://github.com/vector-im/riot-web/issues/13422
Fixes https://github.com/vector-im/riot-web/issues/13418
2020-04-28 18:35:16 +01:00
60d51a0f1e
Merge pull request #4506 from matrix-org/dbkr/aggregate_device_verify_toasts
...
Aggregate device verify toasts
2020-04-28 11:00:52 +01:00
b396096cd2
Fix set up encryption toast to have use "set up" as action
...
This changes the "set up encryption" toast to use "set up" as the primary action
button, instead of "upgrade". Other toasts that do use text about upgrading will
keep their primary action text of "upgrade" as before.
Fixes https://github.com/vector-im/riot-web/issues/13231
2020-04-27 18:35:51 +01:00
a5ee99b858
Aggregate device verification toasts into one toast
...
'Review' now opens the only place we can verify our own devices:
our user info.
2020-04-27 18:33:54 +01:00
4e38b63b82
Update i18n
2020-04-27 14:38:22 +01:00
03d89361cd
Update to (almost) match design
2020-04-27 14:35:32 +01:00
ca0cede1aa
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 14:25:47 +01:00
117322b3b5
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:05:28 -06:00
4a0f228714
Merge pull request #4467 from matrix-org/travis/seshat-enable
...
Take encrypted message search out of labs
2020-04-23 10:21:58 +01:00
a3f4244dc0
Merge pull request #4472 from matrix-org/t3chguy/complete_security_designs
...
Update login security copy and design to match Figma
2020-04-22 23:07:48 +01:00
80b8120bc3
Update login security copy and design to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:32:02 +01:00
bc690c8f17
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 21:41:30 +01:00
5c77df2afd
i18n
2020-04-22 11:01:07 -06:00
ce65df6a98
Merge remote-tracking branch 'origin/develop' into dbkr/create_secret_storage_handle_load_error
2020-04-21 09:40:44 +01:00
58c8f2188a
Handle load error in create secret storage dialog
2020-04-20 18:10:23 +01:00
a55698e943
Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements
2020-04-20 09:22:38 -06:00
881848b98b
Add modal to confirm that rageshake from cmd was sent
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:19:31 +01:00
d0410ade5e
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:11:40 +01:00
7fe8894c51
Update seshat copy to remove trailing full stop
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-18 23:16:40 +01:00
29028844f9
Merge pull request #4435 from matrix-org/t3chguy/typo1
...
Fix typo
2020-04-17 16:47:27 +01:00
518639e8b1
Fix typo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 16:04:38 +01:00
e3d784816d
Merge branch 'develop' into foldleft/better-errors
2020-04-17 14:11:05 +01:00
66de06c7b9
Merge pull request #4381 from matrix-org/t3chguy/rageshake_incompatible_browser
...
Rageshake: remind user of unsupported browser and send modernizr report
2020-04-17 13:14:40 +01:00
cd65bdc799
Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot
...
Conflicts:
src/components/views/rooms/RoomBreadcrumbs.js
src/components/views/rooms/RoomTile.js
2020-04-17 12:58:54 +01:00
81c7660bf5
Iterate copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-17 12:25:16 +01:00
b5130ca5dc
Clean up setting definition to follow surrounding practices
...
It's not perfect, but we're at least okay with it.
2020-04-16 11:12:47 -06:00
aea7ede7d0
update PHASE_PASSPHRASE copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:55:43 +01:00
e942a35525
Fixxy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:09:41 +01:00
af59c1b5b3
iterate copy some more
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 14:02:32 +01:00
8c8509a603
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 13:48:52 +01:00
f65c31383d
Copy tweaks with Nad
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:52:35 +01:00
a9a2999ccc
Use `recovery passphrase` and `recovery key` everywhere
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-16 12:26:12 +01:00
76ce4081cb
i18n
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-15 12:31:27 +01:00
77bdde4021
Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements
2020-04-14 12:58:16 -06: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
db09cadb66
remove spinner, change copy, add button placeholder
2020-04-14 17:19:15 +02:00
6d33138950
op/deop return error if trying to affect an unknown user
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-11 16:41:07 +01:00
879b4e15e5
Use singular text on 'delete sessions' button for SSO
...
Missed in https://github.com/matrix-org/matrix-react-sdk/pull/4357
Not a release blocker at this time.
2020-04-09 16:18:12 -06:00
b518fdd8ee
i18n
2020-04-09 16:05:31 -06:00
a9a253f27f
Merge pull request #4362 from matrix-org/t3chguy/private_room_e2ee
...
Add toggle for e2ee when creating private room
2020-04-09 17:22:58 +01:00
4041c030a5
Apply changes from Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 14:44:34 +01:00
eec28ce38a
Update styling and copy to match Figma
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 13:47:15 +01:00
8ffc206358
Merge pull request #4356 from matrix-org/travis/deactivate-sso
...
Support deactivating your account with SSO
2020-04-08 12:19:53 +01:00
a5f6a07ed6
Merge pull request #4359 from matrix-org/jryans/backup-key-cache-format
...
Add debug status for cached backup key format
2020-04-08 11:32:11 +01:00
ada860f163
Add toggle for e2ee when creating private room in x-signing world
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-08 10:50:22 +01:00
17f3b92726
Merge pull request #4345 from matrix-org/foldleft/12982-notifications
...
Don't show fallback text for verification requests
2020-04-08 09:46:56 +01:00
David Baker