Commit graph

23400 commits

Author SHA1 Message Date
Michael Telatynski
2792988ad1 Revert "Make Screens an enum"
This reverts commit f6492918

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-27 23:59:07 +01:00
Michael Telatynski
531de19fa4 Revert "Discard unused CompatibilityPage.js in react-sdk"
This reverts commit e3ba9c9b

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:11:58 +01:00
Michael Telatynski
e3ba9c9b38 Discard unused CompatibilityPage.js in react-sdk
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 16:11:29 +01:00
Michael Telatynski
f64929187a Make Screens an enum
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:44:35 +01:00
Michael Telatynski
e06b5f8cf3 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/app_load4 2020-04-23 10:12:56 +01:00
Michael Telatynski
4cf234197b iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-23 10:12:50 +01:00
Michael Telatynski
369446a94f
Merge pull request #4475 from matrix-org/t3chguy/reply_big_emoji
Fix BigEmoji for replies
2020-04-23 09:51:06 +01:00
Michael Telatynski
a332e0c0f4 Fix BigEmoji for replies
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 23:27:33 +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
a06401a83e stage new artifacts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 22:57:00 +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
a32687d1ce
Merge pull request #4471 from matrix-org/t3chguy/dialogAesthetics
Fix i18n of SSO UIA copy in Deactivate Account Dialog
2020-04-22 21:50:10 +01:00
Michael Telatynski
bc690c8f17 i18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 21:41:30 +01:00
Michael Telatynski
b10a386675 Fix i18n of SSO UIA copy in Deactivate Account Dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 21:37:52 +01:00
Michael Telatynski
22d6c59213
Merge pull request #4470 from rkfg/autocomplete-fix
Assert type of domNode as HTMLElement to fix build
2020-04-22 21:20:24 +01:00
Sergey Shpikin
ae3dcff230 Assert type of domNode as HTMLElement to fix build
Signed-off-by: Sergey Shpikin <rkfg@rkfg.me>
2020-04-22 22:03:33 +03:00
Michael Telatynski
2952c37a47
Merge pull request #4466 from ihatetothink/unignored-in-settings
Unignored in settings
2020-04-22 19:14:47 +01:00
Agusti Bau
2471b3c100
Update src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
2020-04-22 20:03:22 +02:00
Agusti Bau
5163232081
Update src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
Co-Authored-By: Michael Telatynski <7t3chguy@googlemail.com>
2020-04-22 20:03:13 +02:00
Agusti Bau
ff3272061c Fixed linter errors
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
cd87124e0f removed console logs
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
08bac716d5 Disabled unignore button when unignoring in process
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
47708ca127 Sync settings ignoredUsers with global state
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
Agusti Bau
7a42caa326 Fixed Unignore state variable naming missmatch
Signed-off-by: Agusti Bau <agustibau@gmail.com>
2020-04-22 17:19:03 +02:00
J. Ryan Stinnett
355539feb5
Merge pull request #4464 from matrix-org/jryans/signing-upload-assume-password
Skip auth flow test for signing upload when password present
2020-04-22 15:08:32 +01:00
J. Ryan Stinnett
8536e087ab Skip auth flow test for signing upload when password present
If we already have an account password to use during secret storage setup, then
it's highly likely that the homeserver accepts passwords for device signing key
upload as well. This change then assumes password auth will work without
checking to avoid a request when the server is under high load.

Fixes https://github.com/vector-im/riot-web/issues/13286
2020-04-22 14:48:44 +01:00
Michael Telatynski
ca3ddb3760
Merge pull request #4461 from matrix-org/t3chguy/register_email_not_possible
If user cannot set email during registration don't tell them to
2020-04-22 13:59:43 +01:00
Michael Telatynski
59cc7f0867 here's hoping Synapse doesn't actually try to send an email :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:50:40 +01:00
Michael Telatynski
162531f1c5 try to enable e2e test synapse registration 3pid support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:36:14 +01:00
Michael Telatynski
f2a91e7039
Merge pull request #4463 from matrix-org/t3chguy/fix_autocomplete
Fix post-ts autocomplete, it is not null
2020-04-22 13:29:17 +01:00
Michael Telatynski
54e976f5a8 delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:22:33 +01:00
Michael Telatynski
fc828378fa Fix post-ts autocomplete, it is not null
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:18:54 +01:00
Michael Telatynski
01abb61e9a C
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 13:08:33 +01:00
Michael Telatynski
d915e613dc Convert promise utility module to tyepscript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 12:27:39 +01:00
Michael Telatynski
89345c9e8b Convert MatrixChat to an ES6 Class Component
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 11:55:03 +01:00
Michael Telatynski
4bbd507e7a If user cannot set email during registration don't tell them to
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-22 11:33:45 +01:00
Michael Telatynski
dd1f1b3092
Merge pull request #4452 from matrix-org/t3chguy/autocomplete
Convert autocomplete stuff to TypeScript
2020-04-22 10:20:24 +01:00
Zoe
cb84904638
Merge pull request #4455 from matrix-org/foldleft/devtool-verif-back
Add a back button to the devtools verifications panel
2020-04-22 10:15:05 +01:00
Bruno Windels
47cf4afa90
Merge pull request #4456 from matrix-org/bwindels/waitforxsignkeystoverify
Fix: wait until cross-signing keys are fetched to show verify button
2020-04-22 07:35:58 +00:00
Michael Telatynski
fd10ab840e undo unrelated change
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:10:47 +01:00
Michael Telatynski
65b3adfbe3 discard propTypes some more
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:08:01 +01:00
Michael Telatynski
598cf21684 discard propTypes.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 18:01:23 +01:00
Bruno Windels
b8dd68dda2 wait until cross-signing keys are fetched to show verify button 2020-04-21 18:36:15 +02:00
Zoe
61c6c8de45 Add a back button to the devtools verifications panel 2020-04-21 16:27:31 +01:00
David Baker
02ed921d57
Merge pull request #4451 from matrix-org/dbkr/create_secret_storage_handle_load_error
Handle load error in create secret storage dialog
2020-04-21 10:27:21 +01:00
Michael Telatynski
bf891c85e8 Enable esModuleInterop and iterate PR
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-21 10:01:05 +01: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
Travis Ralston
5dca84379f
Merge pull request #4382 from matrix-org/travis/addwidget-improvements
Allow iframes and Jitsi URLs in /addwidget
2020-04-21 00:30:46 -06:00
Michael Telatynski
3b245ee678 add more type annotations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 21:05:00 +01:00
Michael Telatynski
8398e83d33 add more type annotations
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-20 20:35:57 +01:00