mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-17 07:11:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
31241 commits 219 branches 562 tags 474 MiB
Commit graph

2276 commits

Author SHA1 Message Date
Michael Telatynski
cbcac9dd49 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs 
 Conflicts:
	package.json
 2020-08-03 12:54:06 +01:00
Bruno Windels
5a3bda7eea Add title and icon to empty state of file and notification panel 2020-08-03 13:30:56 +02:00
Travis Ralston
968fbd5cba Merge branch 'develop' into travis/echo/audit 2020-07-30 10:18:30 -06:00
Travis Ralston
7522380763 Update copy 2020-07-30 10:17:47 -06:00
Bruno Windels
a281c617be string order changed 2020-07-30 10:42:46 +02:00
Travis Ralston
c5574219bb Implement dialog for resending local echo transactions 2020-07-29 20:36:04 -06:00
Travis Ralston
14b0def143 Fix echo handling and show a barebones toast on error 
The EchoTransaction was wrongly assuming that it knew better than the caller for when the success condition was met, so the echo marking has been left an exercise for the caller. In this case, we mark when we finally receive the sync with the updated rules.

We also have to cancel previous transactions otherwise if the user mashes buttons we could forever show the toast, and that would be bad.
 2020-07-29 19:11:24 -06:00
Travis Ralston
0f1b9937a9 Connect RoomTile's notification volume to local echo 
This presumes success as we don't yet have a UI for failures.
 2020-07-29 16:54:33 -06:00
Bruno Windels
d8baad31da provide nicer error for no known servers error when accepting an invite 2020-07-29 16:51:37 +02:00
Jorik Schellekens
d55699211e Update copy icon on pre block and share dialogues 2020-07-27 15:13:02 +01:00
Michael Telatynski
60a6b13f4b
Merge pull request #5026 from matrix-org/t3chguy/room-list/14440 
Put low priority xor toggle back in the room list context menu
 2020-07-24 00:02:50 +01:00
Michael Telatynski
6bb9be56cd
Merge pull request #5025 from matrix-org/t3chguy/room-list/14662 
Update message previews
 2020-07-22 10:03:30 +01:00
Michael Telatynski
c4fc70b9be Post-merge fix 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 22:28:36 +01:00
Michael Telatynski
aaad18c9c2 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:55:22 +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
Michael Telatynski
193a0d89af Prefix message previews for emotes with a * 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-21 09:31:22 +01:00
Travis Ralston
de35e0dfcd Update i18n 2020-07-20 16:56:41 -06:00
Travis Ralston
e03978a7ba Update i18n 2020-07-17 16:29:11 -06:00
Travis Ralston
3c047cecfd Remove core structures for the old room list 2020-07-17 14:17:11 -06:00
Travis Ralston
06336a88b3 Remove setting for old room list 2020-07-17 14:06:30 -06:00
David Baker
5db5bc657c
Merge pull request #4833 from matrix-org/dbkr/weird_cancel_dialog 
Hopefully make cancel dialog a bit less weird
 2020-07-17 17:03:43 +01: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
Michael Telatynski
d5f2d43429 Improve Tooltip font/layout consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 15:15:00 +01:00
Michael Telatynski
f2104b59f0 Simplify room sublist context menu 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-16 14:38:04 +01:00
Michael Telatynski
78da0c863a Update copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:52:10 +01:00
Michael Telatynski
ae17cd3ec6 Add tooltip to Room Tile Icon 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 16:46:39 +01:00
Travis Ralston
556da7fe5c Swap out Modular for EMS 2020-07-14 15:47:03 -06:00
Travis Ralston
322d58ba0c Merge branch 'develop' into element 2020-07-14 15:04:17 -06:00
J. Ryan Stinnett
c0a552bfb0 Fix font input branding 2020-07-14 18:04:29 +01:00
J. Ryan Stinnett
f47e94259e Merge branch 'jryans/rename-strings' into 'element' 
Update server dialog, analytics

See merge request new-vector/element/element-web/matrix-react-sdk!7
 2020-07-13 20:43:53 +00:00
Jorik Schellekens
6bf6ae2031 try to fix test 
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/delabs-font-scaling
 2020-07-13 19:08:44 +01:00
J. Ryan Stinnett
995a7879a1 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:49:55 +01:00
J. Ryan Stinnett
231c26c8a4 Update CustomServerDialog to use brand token 2020-07-13 17:57:56 +01:00
Michael Telatynski
b3c3ef594e i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-13 16:39:59 +01: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
David Baker
503159c1c8 Merge branch 'dbkr/in-app-rebrand-prompt' into 'element' 
Add in-app rebranding toasts & prompts

See merge request new-vector/element/element-web/matrix-react-sdk!1
 2020-07-10 17:09:17 +00:00
David Baker
8701e9293e Add in-app rebranding toasts & prompts 
Either shows an informational dialog telling you the name has changed,
or a more naggy one if the user needs to log in on a different URL.
The new URL (if any) is hardcoded based on the current URL, and also
with a bonus config param in case other deployments need to do similar.
 2020-07-10 15:32:34 +01:00
Bruno Windels
c2d4e45495 theme name translation 2020-07-09 19:19:19 +02: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
Jorik Schellekens
23754ae2bd i18n 2020-07-08 18:07:01 +01:00
Bruno Windels
7390baf451 Merge branch 'develop' into element 2020-07-08 18:09:38 +02:00
Travis Ralston
eb38d80bd5
Merge pull request #4920 from matrix-org/joriks/room-list-priorities 
Enable options to favourite and low priority rooms
 2020-07-08 10:08:02 -06:00
Jorik Schellekens
53bdddfcdd Fix discrepancies with style 2020-07-08 16:07:38 +01:00
Bruno Windels
7dad56ca86 Merge branch 'develop' into element 2020-07-08 15:50:17 +02:00
Jorik Schellekens
b3f50b6e17 Enable options to favourite and low priority rooms 2020-07-07 23:14:04 +01:00
Jorik Schellekens
527fe24cd6 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into joriks/room-list-voip 2020-07-07 15:04:22 +01:00
Michael Telatynski
69852ecef4 Merge branches 'develop' and 't3chguy/room-list/123' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/123 
 Conflicts:
	src/components/views/rooms/RoomSublist2.tsx
 2020-07-07 14:10:58 +01:00
Travis Ralston
29aeea2974 Fix i18n 2020-07-06 20:45:36 -06:00
Jorik Schellekens
5176685d20 Implement incoming call box 2020-07-06 23:05:00 +01:00
Jorik Schellekens
1e0ff01d50 De labs font-scaling 2020-07-06 15:43:49 +01:00
David Baker
ac771f6a60 New copy on passphrase cancel dialog 2020-07-06 15:26:40 +01:00
Bruno Windels
08c44333cf Update develop 2020-07-06 09:29:23 +02:00
Michael Telatynski
d366ca12a0 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-06 01:19:00 +01:00
Michael Telatynski
4f1cd82b66 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-05 01:24:22 +01:00
Michael Telatynski
198958dcdd Iterate to match figma 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 22:32:59 +01:00
Michael Telatynski
fe4cf9f9b4 Merge branches 'develop' and 't3chguy/room-list/2' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-list/2 2020-06-30 21:16:37 +01: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
21c5c745c1
Merge pull request #4831 from matrix-org/dbkr/recovery_key_passphrase_2 
Implement new design on security setup & login
 2020-06-30 17:55:03 +01:00
Bruno Windels
baebab7b16 Add element theme 2020-06-30 13:28:19 +02:00
Michael Telatynski
54419878fa Add room notifications context menu and non-default indicator to RoomTile2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-30 00:16:51 +01:00
J. Ryan Stinnett
d1d4bef795
Merge pull request #4622 from aaronraimist/redaction-timestamp 
Show timestamp of redaction on hover
 2020-06-29 11:10:25 +01:00
Travis Ralston
62467144ba Update i18n 2020-06-28 20:03:55 -06:00
David Baker
04d660517b i18n 2020-06-26 18:58:12 +01:00
David Baker
b74674ced8 Right name for security key and fix cancel button 2020-06-26 18:04:06 +01:00
David Baker
15ebaa1470 Port recovery key upload button to new designs 2020-06-26 15:22:04 +01:00
Travis Ralston
67cc84d00d Merge branch 'develop' into travis/room-list/preview-copy 2020-06-26 07:29:49 -06:00
David Baker
f4460ca78f Merge remote-tracking branch 'origin/develop' into dbkr/recovery_key_passphrase_2 2020-06-26 13:12:06 +01:00
Andrew Morgan
87f961df3f Put behind a labs flag 2020-06-26 01:22:46 +01:00
Travis Ralston
acf56559e1 Introduce an entirely new system for handling message preview copy 
This reverts earlier changes made to textForEvent as they are no longer needed.

This also implements an entire tree of textForEvent-like behaviour as the previews need to be different, which is easiest done with its own stack.
 2020-06-25 16:26:49 -06:00
David Baker
29cdebb611 i18n 2020-06-25 13:26:32 +01:00
David Baker
2b144a846a Apply some of the newer styling to passphrase / recovery key entry 2020-06-25 12:44:15 +01:00
Jorik Schellekens
0638b94cc2 Move compact checkbox 2020-06-24 16:06:50 +01:00
David Baker
bf15e96a6a Make pasphrase screen look more like designs 
Although passphrase / passphrase confirm is still split between two
screens because that's more work to change and probably is not a pivotal
part of the UI that needs to change in step with everything else.
 2020-06-24 12:43:56 +01:00
Travis Ralston
380aed4244 Update profile information in User Menu 
Fixes https://github.com/vector-im/riot-web/issues/14158 (we needed an HTTP avatar URL)
Fixes https://github.com/vector-im/riot-web/issues/14159
Fixes https://github.com/vector-im/riot-web/issues/14157
Also fixes an issue where it wasn't updating automatically when the user changed their profile info.

This is all achieved through a new OwnProfileStore which does the heavy lifting, as we have to keep at least 2 components updated.
 2020-06-23 21:01:50 -06:00
Hubert Chathi
74e4ea7d48
Merge pull request #4797 from matrix-org/uhoreg/distrust_backup 
Mark messages with a black shield if the megolm session isn't trusted
 2020-06-23 15:38:03 -04:00
David Baker
3716f9d82c Fix cancel button / prompt 2020-06-23 16:43:52 +01:00
David Baker
0694776b25 Update the 'save your security key' screen 2020-06-23 16:27:41 +01:00
David Baker
6ce8584337 Implement first screen (recovery key / passphrase choice) 2020-06-23 15:04:39 +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
086177d808
Merge pull request #4770 from matrix-org/joriks/font-scaling-message-preview 
Add message preview for font slider
 2020-06-22 11:43:52 +01:00
Jorik Schellekens
2294d23b32
Merge branch 'develop' into joriks/appearance-advanced 2020-06-22 11:27:48 +01:00
David Baker
6e4a2b7efe i18n 2020-06-19 17:22:53 +01:00
David Baker
ee6af6ae9e Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 17:17:18 +01:00
David Baker
3f936a1fe4 Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-19 16:50:29 +01:00
Hubert Chathi
c690cfc6c5 mark messages with a black shield if the megolm session isn't trusted 2020-06-18 21:57:33 -04:00
Michael Telatynski
e723d6115c
Merge pull request #4795 from matrix-org/t3chguy/hide_unknown_rooms_search 
hide search results from unknown rooms
 2020-06-18 23:20:12 +01:00
Michael Telatynski
3ac028565b i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-18 22:50:10 +01:00
Travis Ralston
847f12c289 Update i18n 2020-06-18 15:47:30 -06: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
15881fc7d0
Merge branch 'develop' into joriks/font-scaling-message-preview 2020-06-18 15:19:28 +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
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
3c268a31c8 i18n 2020-06-18 10:48:18 +01:00
David Baker
e0a34d9dea
Revert "Use recovery keys over passphrases" 2020-06-18 09:35:11 +01:00
Michael Telatynski
68ca8b3891
Merge pull request #4763 from matrix-org/t3chguy/slash_cmd_ci 
Fix case-sensitivity of /me to match rest of slash commands
 2020-06-17 17:36:53 +01:00
Travis Ralston
5f2d92c607 Make the room list labs setting reload on change 
Should fix confusing signals sent by having the room list visible but non-functional.
 2020-06-17 08:21:08 -06: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
Michael Telatynski
3217becce8 i18n 2020-06-16 00:52:52 +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
404798d27c Merge remote-tracking branch 'origin/develop' into dbkr/support_no_ssss 2020-06-15 11:36:39 +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
Travis Ralston
4aa15ee191 Wire up the context menu to the room list store 
Updates are passed along magically to the sublist, so we don't need to listen for the room list store's response to our changes.

This just hits the functions introduced in the last commit.
 2020-06-11 22:04:10 -06: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
Travis Ralston
6ccb566587 Show message previews on the new room list tiles 
They're heavily cached.
 2020-06-10 18:37:59 -06:00
Travis Ralston
72bb89d4ee
Merge pull request #4743 from matrix-org/travis/room-list/tile-menu 
Add a context menu to rooms in the new room list
 2020-06-10 07:46:09 -06:00
Travis Ralston
b1fdfb51cd Fix i18n 2020-06-10 07:43:13 -06:00
Travis Ralston
a3391d9a08 Merge branch 'develop' into travis/room-list/hover-state 2020-06-10 07:42:41 -06:00
Travis Ralston
78e1db9d30
Merge pull request #4741 from matrix-org/travis/room-list/resize-handle 
Update resize handle for new designs in new room list
 2020-06-10 07:40:34 -06:00
Travis Ralston
0755b4c148 Add a context menu to rooms in the new room list 
The tag options are not implemented out of concern for diff size. 

This splits the context menu classes out to a new "iconized" style which is common across a number of context menus, including the UserMenu.

Some of the badge/sublist styles had to change to better accommodate the menu icon lining up.

This also contains the framework required for https://github.com/vector-im/riot-web/issues/13961
 2020-06-09 23:09:15 -06:00
Travis Ralston
111394df6d Add hover states and basic context menu to new room list 
The 'sort by' radio buttons are blocked by https://github.com/matrix-org/matrix-react-sdk/pull/4731 as it contains the styles needed.

The 'unread rooms' checkbox is intentionally not hooked up. This is a more complicated refactoring that needs to be done.

The message preview checkbox works, though the previews remain hardcoded in this change. The primary intent of this change is to have a good enough context menu and the hover states.

The hover states are as described in the design.
 2020-06-09 21:12:49 -06:00
Travis Ralston
8ec6d4ce76 Appease i18n 2020-06-09 19:53:07 -06:00
Travis Ralston
5f8b7187cf Update resize handle for new designs 
The diff should have information on what this does and how it is supposed to work.
 2020-06-09 19:48:31 -06:00
Travis Ralston
9377fa513f Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-09 08:11:08 -06:00
Travis Ralston
6c4c581f8f i18n 2020-06-08 20:51:51 -06:00
Travis Ralston
bcc455b248 Merge branch 'develop' into travis/room-list/breadcrumbs 2020-06-08 18:11:42 -06:00
Travis Ralston
0354bf9b6d Reimplement breadcrumbs for new room list 
This all-new component handles breadcrumbs a bit more smoothly for the app by always listening to changes even if the component isn't present. This allows the breadcrumbs to remain up to date for when the user re-enables breadcrumbs.

The new behaviour is that we turn breadcrumbs on once the user has a room, and we don't turn it back off for them.

This also introduces a new animation which is more stable and not laggy, though instead of sliding the breadcrumbs pop. This might be undesirable - to be reviewed.
 2020-06-08 17:11:58 -06:00
Jorik Schellekens
a10e71edcf Use styled radio buttons for theme selection 2020-06-08 18:17:02 +01:00
Travis Ralston
fd8c056200 Fix i18n 2020-06-08 09:40:03 -06:00
Travis Ralston
8e0247afe5 Add most of the UI for the new room list's menu button 
Incomplete implementation: buttons don't work, some text is missing, etc
 2020-06-07 22:06:41 -06:00
David Baker
68e555a0c6 Support accounts with cross signing but no SSSS 
At least at the login stage.

Fixes https://github.com/vector-im/riot-web/issues/13894
 2020-06-05 16:40:20 +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
Travis Ralston
211ad66fea Fix i18n 2020-06-05 08:39:38 -06:00
Travis Ralston
b31a8d494b Merge branch 'travis/room-list/scrolling-resize' into travis/room-list/css-layout 2020-06-05 08:39:19 -06:00
Travis Ralston
e90e70bd77 Misc cleanup 2020-06-04 21:43:33 -06:00
Travis Ralston
0c15b2bdb6 Simple structuring of the room list itself 
This covers the larger parts of the design, but doesn't deal with the nuances of hover states, badge sizing, etc.
 2020-06-04 21:21:04 -06:00
Travis Ralston
be4f75bca9 Add a 'show more' button to room lists 2020-06-03 21:53:08 -06:00
David Baker
226abb457e Update copy in encryption upgrade swcreen 2020-06-03 12:24:22 +01:00
David Baker
6f3bfc96ca Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-03 11:01:43 +01:00
Michael Telatynski
eb536ff2f7 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 
 Conflicts:
	src/components/views/dialogs/CreateRoomDialog.js
	src/components/views/dialogs/InviteDialog.js
	src/components/views/right_panel/UserInfo.js
	src/createRoom.js
 2020-06-03 10:51:17 +01:00
Michael Telatynski
936445ab2d
Merge pull request #4660 from matrix-org/t3chguy/kill_UDE_and_UDD 
Remove legacy codepaths for Unknown Device Error (UDE/UDD) handling
 2020-06-03 10:45:47 +01:00
Michael Telatynski
653b2ff060
Merge pull request #4655 from matrix-org/t3chguy/remove_cross_signing 
Remove feature_cross_signing
 2020-06-03 10:42:13 +01:00
Michael Telatynski
d99babfe05 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-02 21:51:05 +01:00
David Baker
b83ecb1781 Merge remote-tracking branch 'origin/develop' into dbkr/recovery_keys_over_passphrases 2020-06-02 18:53:54 +01:00
David Baker
e06ba2003b Prompt for recovery key on login rather than passphrase 
Only show passphrase options at all if the user has a passphrase on
their SSSS key.
 2020-06-02 16:32:15 +01:00
Michael Telatynski
3fbfb62bc9 Merge branches 'develop' and 't3chguy/emoji_picker_composer' of github.com:matrix-org/matrix-react-sdk into t3chguy/emoji_picker_composer 2020-06-02 14:00:37 +01:00
Michael Telatynski
ef1d682683 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-02 13:51:58 +01:00
Michael Telatynski
5025de5525 Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault 2020-06-01 23:28:21 +01:00
Michael Telatynski
d3523afd29 delint scss and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 23:11:47 +01:00
Michael Telatynski
a2fb96eb8f Update Create Room Dialog microcopy for e2ee-default:false 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-06-01 22:59:14 +01:00
Travis Ralston
4dda573527 i18n 2020-06-01 15:43:29 -06:00
Michael Telatynski
efd0da44a1 Give contextual feedback for manual update check instead of banner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-29 18:24:45 +01:00
David Baker
f54bac0e95 Use recovery keys over passphrases 
Step 1 - change CreateSecretStorageDialog to just give a recovery key
rather than a passphrase.
 2020-05-29 15:42:07 +01:00
Michael Telatynski
0242b6f3f3
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2 
Migrate Banners to Toasts
 2020-05-28 18:21:28 +01:00
Michael Telatynski
8aaa7825ef Also kill off things that these kept behind 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-28 17:12:19 +01:00
Jorik Schellekens
c9d5ed4d00 i18n 2020-05-28 14:32:20 +01:00
Michael Telatynski
cf50e1a408 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-27 10:31:30 +01:00
Michael Telatynski
c492ae97fd Merge branches 'develop' and 't3chguy/toasts3_2' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3_2 2020-05-27 09:45:38 +01:00
David Baker
a496dafd41 Remove the keyshare dialog 
Fixes https://github.com/vector-im/riot-web/issues/11908
 2020-05-26 16:51:20 +01:00
David Baker
e5c4d6fdcd
Merge pull request #4644 from matrix-org/dbkr/kill_encryptedeventdialog 
Remove EncryptedEventDialog
 2020-05-26 13:55:02 +01:00
Michael Telatynski
b7428fcf35
Merge pull request #4618 from matrix-org/t3chguy/toasts3 
Migrate Toasts to Typescript and to granular priority system
 2020-05-26 13:48:47 +01:00
David Baker
352727906e i18n 2020-05-26 13:40:36 +01:00
Michael Telatynski
c74d890774 Merge branches 'develop' and 't3chguy/toasts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts3 
 Conflicts:
	src/@types/global.d.ts
	src/components/structures/ToastContainer.tsx
 2020-05-26 13:38:17 +01:00
Michael Telatynski
0713139dc5 Merge branches 'develop' and 't3chguy/confusing_copy' of github.com:matrix-org/matrix-react-sdk into t3chguy/confusing_copy 2020-05-26 13:35:18 +01:00
Michael Telatynski
8062e5a6e8
Merge pull request #4634 from matrix-org/t3chguy/passphrase-copy 
Update confirm passphrase copy
 2020-05-26 12:02:27 +01:00
Michael Telatynski
e049ead25f
Merge pull request #4636 from matrix-org/t3chguy/emojipickera11y 
Improve accessibility of the emoji picker
 2020-05-26 12:02:07 +01:00
Michael Telatynski
c00fd326c5
Merge pull request #4613 from matrix-org/t3chguy/toasts1 
Improve style of toasts to match Figma
 2020-05-26 11:59:58 +01:00
Michael Telatynski
707e22ad09
Merge pull request #4402 from matrix-org/t3chguy/alias 
Replace `alias` with `address` in copy for consistency
 2020-05-26 09:36:58 +01:00
Michael Telatynski
6677a3f20e Implement Tabs with Automatic Activation pattern for EmojiPicker header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 15:46:44 +01:00
Michael Telatynski
c73c3ae927 Update confirm passphrase copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 11:35:21 +01:00
Michael Telatynski
1f52b5e203 Update Crypto Store Too New copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-25 10:59:31 +01:00
Michael Telatynski
3d2b56aecd i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:23:23 +01:00
Michael Telatynski
891ba1bbe3 Replace New Version Bar with a Toast 
discards the `new_version` dispatch

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 23:08:45 +01:00
Michael Telatynski
9f060d1132 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:34:32 +01:00
Michael Telatynski
c91f8c2631 Migrate Analytics Banner to a Toast 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 22:04:21 +01:00
Aaron Raimist
c2dd4a5771 Merge branch 'develop' into redaction-timestamp 2020-05-22 15:16:12 -05:00
Aaron Raimist
b0be99a8f0
Show timestamp of redaction on hover 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-05-22 14:41:32 -05:00
Michael Telatynski
49c0748990 delint and i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 14:32:41 +01:00
Michael Telatynski
a822ab49d5 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-22 13:40:30 +01:00
David Baker
6bfa31cd47 run i18n which is unhappy about 'create room' for some reason 2020-05-22 10:34:00 +01:00
Travis Ralston
7ff850deea
Merge pull request #4253 from matrix-org/travis/room-list-2 
Rewrite the room list store
 2020-05-21 13:30:32 -06:00
Michael Telatynski
6a0ffe905f Iterate text alignment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-21 17:12:16 +01:00
Jorik Schellekens
82b76192ae Fixes, lints and i18n 2020-05-20 14:44:56 +01:00
Jorik Schellekens
6d9d4ee547 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-20 13:46:17 +01:00
Jorik Schellekens
323d0762fc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/irc-ui 2020-05-19 18:03:44 +01:00
Jorik Schellekens
2e325191bc Merge remote-tracking branch 'nv/develop' into joriks/irc-ui 2020-05-19 17:18:36 +01:00
Michael Telatynski
e7d37228f2
Merge pull request #4603 from matrix-org/t3chguy/add_room_tooltip 
Label the create room button better than "Add room"
 2020-05-19 11:57:59 +01:00
Travis Ralston
38920e7f30 Merge branch 'develop' into travis/room-list-2 2020-05-18 23:23:59 -06:00
Jorik Schellekens
bba6b2c441 Appease i18n 2020-05-18 17:06:54 +01:00
Michael Telatynski
1eea203db6
Merge pull request #4599 from matrix-org/t3chguy/progress_colour 
Consolidate password/passphrase fields into a component & add dynamic colour to progress
 2020-05-18 11:08:08 +01:00
Michael Telatynski
a864643d98 Label the create room button something better than "Add room" 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-18 10:37:02 +01:00
Michael Telatynski
f2979f3fd8 replace zxcvbn field in CreateKeyBackupDialog with PassphraseField 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-14 20:59:46 +01:00
Travis Ralston
9fbd489b3b Update i18n 2020-05-14 13:03:43 -06:00
Travis Ralston
df3d5c4159 Update i18n for room list 2020-05-14 12:46:16 -06:00
Travis Ralston
08419d195e Initial breakout for room list rewrite 
This does a number of things (sorry):
* Estimates the type changes needed to the dispatcher (later to be replaced by https://github.com/matrix-org/matrix-react-sdk/pull/4593)
* Sets up the stack for a whole new room list store, and later components for usage.
* Create a proxy class to ensure the app still functions as expected when the various stores are enabled/disabled
* Demonstrates a possible structure for algorithms
 2020-05-14 12:44:29 -06:00
Michael Telatynski
562c5aa9c5
Merge pull request #4588 from matrix-org/t3chguy/kbd1 
Add new keyboard shortcuts for jump to unread and upload file
 2020-05-14 19:29:09 +01:00
Michael Telatynski
239197a3cb
Merge pull request #4394 from matrix-org/t3chguy/qrcode 
wrap node-qrcode in a React FC and use it for ShareDialog
 2020-05-14 17:31:26 +01:00
Travis Ralston
acc17e6026
Merge pull request #4584 from matrix-org/travis/deactivate-fix 
Acquire a new session before enacting deactivation
 2020-05-14 07:52:17 -06:00
Michael Telatynski
1ba19e78f8 Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode 
 Conflicts:
	package.json
 2020-05-14 10:50:42 +01:00
Bruno Windels
4a8e642400
Merge pull request #4581 from matrix-org/bwindels/remove-asym-4s 
Remove UI for upgrading 4S to symmetric encryption
 2020-05-14 08:10:39 +00:00
Travis Ralston
9dd93f14ba
Merge pull request #4555 from matrix-org/travis/sso-xsigning 
Add copy to SSO prompts during cross-signing setup
 2020-05-13 15:33:09 -06:00
Jorik Schellekens
312b616d77 fix i18n 2020-05-13 14:11:16 +01:00
Michael Telatynski
0e05e6db86 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-13 10:40:23 +01:00
Travis Ralston
5e86dc2d60 Update i18n strings 2020-05-12 17:20:11 -06:00
David Baker
8b8eb7d3c0
Merge pull request #4580 from matrix-org/dbkr/dont_npe_if_no_device 
Avoid soft crash if unknown device in verification
 2020-05-12 14:36:54 +01:00
David Baker
a000be2b01 i18n 2020-05-12 14:03:40 +01:00
Bruno Windels
b3c641184b remove obsolete strings 2020-05-12 14:54:49 +02:00
Michael Telatynski
6ea9aebda3 Add slash commands /query and /msg to match IRC 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-11 10:55:31 +01:00
Jorik Schellekens
33a5b5142d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/font-scaling-slider 2020-05-07 18:01:20 +01:00
Jorik Schellekens
bc5fc57dd6 Lint 
This is why we shouldn't rely on regex
 2020-05-07 14:22:15 +01:00
Jorik Schellekens
771ae5e18f Fix encryption badge layouts and replies. 
Begin removing dependence on slider.
Move settings to labs.
Username disambiguation.
 2020-05-07 14:04:56 +01:00
Jorik Schellekens
a38d5eb224 add useIRCLayout setting 2020-05-07 14:04:29 +01:00
Michael Telatynski
f0085a9feb Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-05-07 09:56:21 +01:00
Travis Ralston
17be9805e1 Set SSO dialog aesthetics for cross-signing setup 
Fixes https://github.com/vector-im/riot-web/issues/13042
 2020-05-06 14:24:37 -06:00
Travis Ralston
d31a0199bc Add default dialog aesthetics to avoid empty SSO dialogs in future 2020-05-06 14:24:16 -06:00
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
Travis Ralston
1e30bdb739 Early proof of concept for SSO UIA 
It works well enough to start doing design.
 2020-03-27 14:39:59 -06:00
Michael Telatynski
de0895b881 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-27 14:06:21 +00:00
Michael Telatynski
98f9f1e956 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-27 09:59:43 +00:00
David Baker
1f12d16b70
Merge pull request #4287 from matrix-org/dbkr/show_backup_key_cached 
Show whether backup key is cached
 2020-03-27 09:31:03 +00:00
David Baker
ccb3283fd3 Show whether backup key is cached 
in cross signing debug panel
 2020-03-26 18:50:31 +00:00
Bruno Windels
ce77593cf9 rename toast title 2020-03-26 17:37:44 +01:00
Zoe
04849f7f0d incorporated design feedback 2020-03-26 13:47:32 +00:00
Zoe
9c392ce8bb Merge branch 'develop' into foldleft/better-errors 2020-03-26 13:38:50 +00:00
David Baker
6d90307ff7
Merge pull request #4277 from matrix-org/dbkr/trust_cross_signing_flag 
Add a flag to control whether cross-signing signatures are trusted
 2020-03-26 12:19:14 +00:00
David Baker
e2bb0a3b46
Merge pull request #4281 from matrix-org/dbkr/ssss_upgrade_copy 
Update copy on SSSS symmetric upgrade toast
 2020-03-26 12:04:58 +00:00
Michael Telatynski
39fdde627d
Merge pull request #4278 from matrix-org/t3chguy/e2e_copy 
Update cross-signing verification copy and fix i18n
 2020-03-26 11:55:36 +00:00
David Baker
f7e9cf4552 i18n 2020-03-26 11:15:07 +00:00
Bruno Windels
44ce5b5764
Merge pull request #4267 from matrix-org/bwindels/setupcrosssigningafterskip 
Fix: make self-verification wait for incoming request
 2020-03-26 10:08:15 +00:00
David Baker
a9e7bf9899 Merge remote-tracking branch 'origin/develop' into dbkr/trust_cross_signing_flag 2020-03-26 09:40:09 +00:00
Michael Telatynski
7ca6a4b777 Iterate copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 23:00:46 +00:00
Michael Telatynski
d098c91c30 Update cross-signing verification copy and fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-25 22:38:11 +00:00
David Baker
25e7bde7bc Add a flag to control whether cross-signing signatures are trusted 
Fixes: https://github.com/vector-im/riot-web/issues/12616
 2020-03-25 18:38:12 +00:00
Bruno Windels
7cded53cdb fix i18n 2020-03-24 17:02:36 +01:00
J. Ryan Stinnett
1c802cc6af Show private key cache state in debug panel 2020-03-24 15:50:08 +00:00
David Baker
96ec18a662
Merge pull request #4242 from matrix-org/dbkr/symmetric-ssss-migrate 
Migration to symmetric SSSS
 2020-03-24 13:12:24 +00:00
David Baker
d6d15bc5c7 Add secret storage outdated section to advanced 2020-03-24 11:17:33 +00:00
Michael Telatynski
a56e474203 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/LoggedInView.js
 2020-03-20 16:10:27 +00:00
Michael Telatynski
064b533a4b Merge branches 'develop' and 't3chguy/shortcuts3' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts3 
 Conflicts:
	src/components/structures/RoomView.js
 2020-03-20 16:06:07 +00:00
Michael Telatynski
75c3a10bfa Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-20 15:57:25 +00:00
Bruno Windels
39bd1da1d0 update copy 2020-03-20 15:43:05 +01:00
Bruno Windels
073c2c525f Add "legacy verify" button to untrusted session dialog 2020-03-20 15:36:58 +01:00
Michael Telatynski
2b40bb905a Add shortcut CmdOrCtrl+. to toggle right panel. Gets rid of forced-update on right panel changes which may not be the ones we care about. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-20 00:18:24 +00:00
Michael Telatynski
7d28137cfd Merge branches 'develop' and 't3chguy/shortcuts1' of github.com:matrix-org/matrix-react-sdk into t3chguy/shortcuts1 2020-03-19 19:18:20 +00:00
Michael Telatynski
578b3f2b97 Improve Keyboard Shortcuts. Add alt-arrows & alt-shift-arrows. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-19 19:07:33 +00:00
Travis Ralston
20d0e8a888
Merge pull request #4234 from matrix-org/travis/wrapped-jitsi 
Use a local wrapper for Jitsi calls
 2020-03-19 11:52:14 -06:00
Michael Telatynski
c616107d1c
Merge pull request #4233 from matrix-org/t3chguy/invite_fixes 
Invite Dialog fixes
 2020-03-19 17:32:30 +00:00
Zoe
d4486a3eeb
Merge pull request #4229 from matrix-org/foldleft/11574-handle-upload-errors 
Report to the user when a key signature upload fails
 2020-03-19 16:00:18 +00:00
Travis Ralston
2a68479f5a Remove unused strings 2020-03-18 15:53:05 -06:00
Michael Telatynski
22c8df9f23 Update DM invite copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-18 21:08:37 +00:00
Michael Telatynski
d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd 2020-03-18 20:41:13 +00:00
Michael Telatynski
cad28c81c0 Add Keyboard shortcuts dialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-18 16:40:21 +00:00
Michael Telatynski
ef79492f2c
Merge pull request #4209 from matrix-org/t3chguy/redesign/room_directory 
Room Directory Explore Servers redesign
 2020-03-18 11:51:42 +00:00
Travis Ralston
1453120c66
Merge pull request #4208 from matrix-org/matthew/jump-to-bottom-ublock 
Rename 'jump to bottom' to avoid ublock block
 2020-03-17 13:06:41 -06:00
Matthew Hodgson
af023a2d7c rename 'jump to bottom' to avoid ublock block 2020-03-17 11:15:57 -06:00
Zoe
ea99eebb7b Report to the user when a key signature upload fails 2020-03-17 11:45:27 +00:00
Bruno Windels
e8c77543f9
Merge pull request #4221 from matrix-org/bwindels/aliaslipstick 
Fix: make alternative addresses UX less confusing
 2020-03-17 10:55:36 +00:00
Bruno Windels
010661249b run i18n 2020-03-17 11:47:56 +01:00
David Baker
6c4b572c7e Wait for verification request on login 
Basically just changes to the designed screen to wait for an incoming
verification request in order to verify the device & cross-sign it.

Fixes https://github.com/vector-im/riot-web/issues/11215
Fixes https://github.com/vector-im/riot-web/issues/11217
 2020-03-16 17:47:56 +00:00
Bruno Windels
d6ddc5096f tweak labels, etc 2020-03-16 18:25:13 +01:00
Bruno Windels
31cb257eb9 add headers and copy to lessen confusion of new alias workings 2020-03-16 17:28:45 +01:00
Michael Telatynski
78543da7f4 Fix missed copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 12:28:20 +00:00
Michael Telatynski
6f27c4c17a s/Server address/Server name/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-16 11:45:51 +00:00
Aaron Raimist
06fce7158a
Rename Review Devices to Review Sessions 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-15 13:47:25 -05:00
Michael Telatynski
ee1659625c Add Field validation to TextInputDialog 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 17:32:02 +00:00
Travis Ralston
f5f433b347
Merge pull request #4148 from matrix-org/travis/poc/theme-command 
Proof of concept for custom theme adding
 2020-03-13 09:26:07 -06:00
Michael Telatynski
401d85ea6f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 14:42:19 +00:00
Michael Telatynski
dd4dc054ae i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 00:06:41 +00:00
Michael Telatynski
86e53ea2c3 Initial attempt to redesign explore servers in room directory 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-13 00:02:50 +00:00
Bruno Windels
6b552e5ce8
Merge pull request #4199 from matrix-org/bwindels/aliasrefinements 
Fixes for removing local alias
 2020-03-12 11:29:33 +00:00
Travis Ralston
d470f9649d
Merge pull request #4183 from aaronraimist/room-name-change-ev 
When room name is changed, show both the old and new name
 2020-03-11 11:08:52 -06:00
Bruno Windels
cccf7cd07f specific error for lack of permissions when trying to delete an alias 2020-03-11 12:13:28 +01:00
Bruno Windels
1ae4a1cd5b
Merge pull request #4195 from matrix-org/bwindels/alwayshavealabelforcanonaliasevent 
Add fallback label for canonical alias events that dont change anything
 2020-03-11 09:04:14 +00:00
Bruno Windels
f22554e99a
Merge pull request #4194 from matrix-org/bwindels/enable4sonverify 
Enable 4S if needed when trying to verify or accepting verification
 2020-03-10 18:03:02 +00:00
Bruno Windels
5d7f2f96e7 add fallback label for canonical alias events that dont change anything 2020-03-10 18:45:51 +01:00
Bruno Windels
e34a37102a move i18n strings around as script desires 2020-03-10 16:56:20 +01:00
Bruno Windels
c5e62ec0ef
Merge pull request #4187 from matrix-org/bwindels/altaliases 
Allow editing of alt_aliases according to MSC2432
 2020-03-10 12:45:16 +00:00
Bruno Windels
378939bed7 add timeline text descriptions for modifying alt_aliases 2020-03-09 18:24:48 +01:00
Bruno Windels
9961f810f1 update i18n 2020-03-09 16:54:00 +01:00
Bruno Windels
7079d70f18 hide local aliases by default 2020-03-09 16:32:13 +01:00
Bruno Windels
eb539537f2 add recommendations for alt aliases 2020-03-09 16:31:07 +01:00
Bruno Windels
ee9558cb0b change state from domainToAliases to local and alt aliases 2020-03-09 16:28:33 +01:00
Aaron Raimist
f9f87defa4 Only show old room name if it exists 2020-03-07 12:36:24 -06:00
Aaron Raimist
7850c506b7
When room name is changed, show both the old and new name 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-06 22:21:38 -06:00
Travis Ralston
6aeca7b853 UX polish for custom themes 2020-03-06 17:43:10 -07:00
Travis Ralston
65d7bb2ef9 Merge branch 'develop' into travis/poc/theme-command 2020-03-06 17:33:22 -07:00
Damir Jelić
69389823f7 ManageEventIndexDialog: Reword and move the crawler state around a bit. 
This reflects now the latests design on Figma.
 2020-03-06 16:07:10 +01:00
Damir Jelić
364899b27d ManageEventIndexDialog: Show how many rooms are done instead being processed. 2020-03-06 15:44:23 +01:00
Damir Jelić
bff3f3e632 Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms." 
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
 2020-03-06 15:44:23 +01:00
Damir Jelić
8fe54e5dca ManageEventIndexDialog: Reword the status for the currently indexing rooms. 2020-03-06 15:44:23 +01:00
Travis Ralston
fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button 
Include a mark as read X under the scroll to unread button
 2020-03-05 11:01:12 -07:00
Travis Ralston
e9657cea70 Merge branch 'develop' into travis/poc/theme-command 2020-03-05 09:49:32 -07:00
J. Ryan Stinnett
3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link 
link to matrix.org/security-disclosure-policy in help screen
 2020-03-05 14:47:02 +00:00
Ben Parsons
d28d330b33 run yarn i18n 2020-03-05 14:33:40 +00:00
Travis Ralston
e83a4ddbe5 i18n 2020-03-03 23:24:56 -07:00
Michael Telatynski
f08d034f84
Merge pull request #4158 from matrix-org/t3chguy/sso 
riot-desktop open SSO in browser so user doesn't have to auth twice
 2020-03-03 22:27:48 +00:00
Mark Striemer
df9710907c Add en_US string 2020-03-02 15:45:16 -06:00
Michael Telatynski
f8045e428b riot-desktop open SSO in browser so user doesn't have to auth twice 2020-03-02 14:59:54 +00:00
Michael Telatynski
a5e664410f Add /whois SlashCommand to open UserInfo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-29 01:29:52 +00:00
Travis Ralston
8520310e6e Proof of concept for custom theme adding 
For https://github.com/vector-im/riot-web/issues/12517
 2020-02-28 11:42:16 -07:00
Travis Ralston
60e26db729
Merge pull request #3829 from Cadair/login_group 
Add a Login button to startAnyRegistrationFlow
 2020-02-28 10:35:49 -07:00
J. Ryan Stinnett
5c81ae41dd
Merge pull request #4146 from matrix-org/jryans/locked-upgrade-dialog 
Prefer account password variation of upgrading
 2020-02-28 12:47:42 +00:00
J. Ryan Stinnett
b1543c4141 Regen i18n 2020-02-28 12:32:14 +00:00
Michael Telatynski
f036f0bd83 Fix copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:19:05 +00:00
Michael Telatynski
cada584c25 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:09:34 +00:00