PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
24778 commits 1 branch 0 tags 338 MiB
Commit graph

1765 commits

Author SHA1 Message Date
Michael Telatynski
62bbf15efe
Merge pull request #4497 from matrix-org/t3chguy/invite_copy 
Update Invite Dialog copy to include email addresses
 2020-05-06 18:16:36 +01:00
Bruno Windels
b04bb423f8 differentiate copy for own untrusted device dialog 2020-05-05 10:23:39 +02:00
David Baker
3240b3bd60 Add device name to unverified session toast 2020-04-30 16:09:38 +01:00
Zoe
3acb952d9a
Merge pull request #4507 from matrix-org/foldleft/13167-spinner-progress 
Show progress when loading keys
 2020-04-30 14:09:47 +01:00
David Baker
5ecd874e82 yarn i18n 2020-04-30 09:44:15 +01:00
David Baker
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
Zoe
62c73146dc copy changes 2020-04-29 14:14:39 +01:00
David Baker
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
J. Ryan Stinnett
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
David Baker
75c680715f s/unverified/new/ 2020-04-29 10:53:36 +01:00
Michael Telatynski
41dece38a4 iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-29 10:35:35 +01:00
David Baker
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
Jorik Schellekens
4e6748416c Fix i18n 2020-04-28 15:53:12 +01:00
Jorik Schellekens
1b83faaa8d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-04-28 15:38:46 +01:00
Zoe
689d6735fc i18n 2020-04-28 11:36:28 +01:00
Zoe
9d1c73348c Show progress when loading keys 2020-04-28 11:32:51 +01:00
David Baker
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
Michael Telatynski
c7870090f8 clean ups 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 23:29:38 +01:00
Michael Telatynski
9dd204dd10 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-04-27 23:09:08 +01:00
J. Ryan Stinnett
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
David Baker
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
David Baker
4e38b63b82 Update i18n 2020-04-27 14:38:22 +01:00
David Baker
03d89361cd Update to (almost) match design 2020-04-27 14:35:32 +01:00
David Baker
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
Michael Telatynski
37374036d5 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-27 14:09:41 +01:00
Travis Ralston
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
Michael Telatynski
d3b0e008c1 first draft of Redaction ELS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:39:23 +01:00
Michael Telatynski
e16f511527 Redesign redactions 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-24 15:07:39 +01:00
Jorik Schellekens
e5cb149296 Handle fontslider input errors correctly 2020-04-23 13:52:08 +01:00
Jorik Schellekens
c86638c667 add toggle between font slider and custom setting 2020-04-23 12:09:08 +01:00
Jorik Schellekens
715bcb3c96 i18n match file moves 2020-04-23 10:45:48 +01:00
Jorik Schellekens
e455473d8f i18n happy 2020-04-23 10:45:47 +01:00
Jorik Schellekens
7c9df04d42 Use "Appearance" instead of "Style" 2020-04-23 10:45:47 +01:00
Jorik Schellekens
14551b1885 Hide font scaling behind labs 2020-04-23 10:45:47 +01:00
Jorik Schellekens
bce1fa0c1a Simple translations 2020-04-23 10:45:47 +01:00
J. Ryan Stinnett
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
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
bc690c8f17 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 21:41:30 +01:00
Travis Ralston
5c77df2afd i18n 2020-04-22 11:01:07 -06:00
David Baker
ce65df6a98 Merge remote-tracking branch 'origin/develop' into dbkr/create_secret_storage_handle_load_error 2020-04-21 09:40:44 +01:00
David Baker
58c8f2188a Handle load error in create secret storage dialog 2020-04-20 18:10:23 +01:00
Travis Ralston
a55698e943 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-20 09:22:38 -06:00
Michael Telatynski
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
Michael Telatynski
d0410ade5e i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-19 12:11:40 +01:00
Michael Telatynski
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
Michael Telatynski
29028844f9
Merge pull request #4435 from matrix-org/t3chguy/typo1 
Fix typo
 2020-04-17 16:47:27 +01:00
Michael Telatynski
518639e8b1 Fix typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 16:04:38 +01:00
Zoe
e3d784816d Merge branch 'develop' into foldleft/better-errors 2020-04-17 14:11:05 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
81c7660bf5 Iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-17 12:25:16 +01:00
Travis Ralston
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
Michael Telatynski
aea7ede7d0 update PHASE_PASSPHRASE copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:55:43 +01:00
Michael Telatynski
e942a35525 Fixxy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:09:41 +01:00
Michael Telatynski
af59c1b5b3 iterate copy some more 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 14:02:32 +01:00
Michael Telatynski
8c8509a603 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 13:48:52 +01:00
Michael Telatynski
f65c31383d Copy tweaks with Nad 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 12:52:35 +01:00
Michael Telatynski
a9a2999ccc Use recovery passphrase and recovery key everywhere 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-16 12:26:12 +01:00
Michael Telatynski
76ce4081cb i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-15 12:31:27 +01:00
Travis Ralston
77bdde4021 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-14 12:58:16 -06:00
Bruno Windels
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
Bruno Windels
db09cadb66 remove spinner, change copy, add button placeholder 2020-04-14 17:19:15 +02:00
Michael Telatynski
384336e8f1 s/alias/address/ in copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-14 10:06:57 +01:00
Michael Telatynski
610fab7857 i18n and delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-11 23:53:24 +01:00
Michael Telatynski
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
Travis Ralston
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
Travis Ralston
b518fdd8ee i18n 2020-04-09 16:05:31 -06:00
Michael Telatynski
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
Michael Telatynski
4041c030a5 Apply changes from Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 14:44:34 +01:00
Michael Telatynski
eec28ce38a Update styling and copy to match Figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-08 13:47:15 +01:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
Michael Telatynski
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
Zoe
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
J. Ryan Stinnett
3196c1a031 Update i18n 2020-04-07 19:24:07 +01:00
J. Ryan Stinnett
c21dccc397 Add debug status for cached backup key format 
Check backup key format to ease tracking such issues

Debug helper for https://github.com/vector-im/riot-web/issues/13057
 2020-04-07 19:11:06 +01:00
Travis Ralston
3ab9634249 Pluralize more differently 2020-04-07 11:46:53 -06:00
Travis Ralston
3be197cf86 Use singular copy when only deleting one device 2020-04-07 11:19:56 -06:00
Michael Telatynski
faab35738f Add new default home page fallback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-07 10:48:56 +01:00
Travis Ralston
bdeba252ec Support deactivating your account with SSO 
Fixes https://github.com/vector-im/riot-web/issues/12940
 2020-04-06 15:42:06 -06:00
Zoe
959801cf2f Special-case certain msgtypes for notifications 2020-04-06 16:26:04 +01:00
Zoe
5ef06357f6 Merge branch 'develop' into foldleft/better-errors 2020-04-06 11:36:46 +01:00
Bruno Windels
37289bc832 i18n 2020-04-03 17:05:20 +02:00
Bruno Windels
6bb6885578 adjust sas copy to use device -> session 2020-04-02 18:28:01 +02:00
Bruno Windels
cc9c5cabb3 adapt encryption info to self-verification 
- hide text when shown in a dialog
 - adapt "waiting for ... to accept" text to self-verif
 2020-04-02 17:51:25 +02:00
Bruno Windels
0307361fa2 more polish for self-verification 2020-04-02 16:42:39 +02:00
Michael Telatynski
1ae370b97e Pull feature_presence_in_room_list out of labs. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-02 15:20:35 +01:00
Bruno Windels
ccf6c9efdc fixup: more i18n 2020-04-02 13:44:19 +02:00
Bruno Windels
a4f448d4ca update i18n 2020-04-02 13:44:19 +02:00
Travis Ralston
094d006928
Merge pull request #4292 from matrix-org/travis/sso-uia 
Support SSO for interactive authentication
 2020-04-01 10:27:24 -06:00
Michael Telatynski
6e61761012 Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds 
 Conflicts:
	src/SlashCommands.tsx
 2020-03-31 11:49:53 +01:00
Michael Telatynski
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso 
Support $riot: Templates for SSO/CAS urls in the welcome.html page
 2020-03-31 09:39:40 +01:00
Travis Ralston
2557875fd2
Merge pull request #4296 from waylon531/upstream 
Added the /html command
 2020-03-30 20:56:24 -06:00
Travis Ralston
de79520150 Add SSO dialog copy for 3PID adding (email/phone) 2020-03-30 20:18:52 -06:00
Travis Ralston
ffa75ef48c Wire up all the dialog parts for SSO, using device deletion as a POC 2020-03-30 20:03:46 -06:00
Travis Ralston
b35356833f Merge branch 'develop' into travis/sso-uia 2020-03-30 14:56:52 -06:00
waylon531
9cf82d8743
Updated strings 
I added a new string for the /html command and had to regerate strings
for i18

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-03-30 11:44:34 -07:00
Michael Telatynski
559b8e174b undo accidental changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 14:13:08 +01:00
Michael Telatynski
167f953ac7 Document Composer:Escape to cancel a reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:35:35 +01:00