Commit graph

1668 commits

Author SHA1 Message Date
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
Michael Telatynski
a1908a208e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list
 Conflicts:
	src/components/views/rooms/RoomList.js
	src/stores/RoomListStore.js
2020-02-26 23:02:06 +00:00
Stuart Mumford
75a4289f54
fix i18n 2020-02-26 21:55:10 +00:00
Stuart Mumford
f980bfec9e
Improve copy 2020-02-26 21:55:10 +00:00
Stuart Mumford
e454d84e9d
Lint
Signed-off-by: Stuart Mumford <stuart@cadair.com>
2020-02-26 21:55:08 +00:00
Ben Parsons
92bc3e83ef yarn i18n 2020-02-25 17:57:31 +00:00
Ben Parsons
566db6c406 link to matrix.org/security-disclosure-policy in help screen 2020-02-25 17:29:59 +00:00
Bruno Windels
17d55abed7
Merge pull request #4126 from matrix-org/bwindels/verifuifeedbackonlag
Improve UI feedback while waiting for network
2020-02-25 17:08:06 +00:00
Zoe
1d8756b95d text improvements 2020-02-25 15:40:06 +00:00