Michael Telatynski
76e61b9948
Merge branches 'develop' and 't3chguy/cs_verification_decoration' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
2020-01-28 17:19:59 +00:00
David Baker
e1e35a53e4
i18n
2020-01-28 17:18:09 +00:00
David Baker
546acb696d
Add confirmation to skip button
...
Re-using the opt out phase which was unused
2020-01-28 17:15:50 +00:00
Michael Telatynski
58df4127d3
Update propTypes and remove todo
2020-01-28 17:14:48 +00:00
Weblate
0a67fb9a6b
Merge branch 'origin/develop' into Weblate.
2020-01-28 16:54:21 +00:00
Szimszon
6c10c1b76d
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (2078 of 2078 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:54:21 +00:00
Travis Ralston
330b489fd5
Switch back to legacy decorators
...
Empirically the build is fine with these, but it is unfortunate that we have to reply on deprecated semantics. TypeScript should help fix this.
2020-01-28 16:44:30 +00:00
David Baker
abfa593791
Make the 'encryption upgrade' flow better
...
Fixes https://github.com/vector-im/riot-web/issues/12086
2020-01-28 16:36:07 +00:00
Weblate
2dbb248598
Merge branch 'origin/develop' into Weblate.
2020-01-28 16:15:54 +00:00
Szimszon
ab8fe80d6b
Translated using Weblate (Hungarian)
...
Currently translated at 98.6% (2048 of 2077 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-28 16:15:54 +00:00
Half-Shot
bfaa9d56fb
prefixes
2020-01-28 16:05:27 +00:00
Half-Shot
ff532dd684
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 16:01:50 +00:00
Damir Jelić
5cabfb63a4
EventIndex: Don't mark the event listener method docs as jsdoc comments.
2020-01-28 16:13:56 +01:00
Weblate
e812c9c986
Merge branch 'origin/develop' into Weblate.
2020-01-28 14:50:24 +00:00
Half-Shot
85bcad0ea0
Styling for Nad
2020-01-28 14:46:22 +00:00
Travis Ralston
720b9a92fe
Merge branch 'develop' into travis/babel-skinning
2020-01-28 14:41:51 +00:00
Weblate
79f3b44279
Merge branch 'origin/develop' into Weblate.
2020-01-28 14:13:09 +00:00
J. Ryan Stinnett
a19cdc9077
Merge pull request #3956 from matrix-org/jryans/trigger-cs-lab-4s
...
Enable cross-signing lab when key in storage
2020-01-28 14:13:04 +00:00
Damir Jelić
948ec203c6
BaseEventIndexManager: Fix the type hints for the empty promises.
2020-01-28 15:07:29 +01:00
Damir Jelić
0b7f23fa54
EventIndex: Improve the documentation a bit.
2020-01-28 15:06:43 +01:00
Travis Ralston
d0c28adfb1
Appease the linter
2020-01-28 12:53:37 +00:00
Travis Ralston
21405b8f25
Fix skinning and babel tagets
2020-01-28 12:47:38 +00:00
J. Ryan Stinnett
9cf59ab16d
Enable cross-signing lab when key in storage
...
When we're starting a new session and find the cross-signing keys in secret
storage, auto-enable the lab for the new session.
Fixes https://github.com/vector-im/riot-web/issues/12100
2020-01-28 12:30:41 +00:00
Weblate
e0ffedca45
Merge branch 'origin/develop' into Weblate.
2020-01-28 11:50:09 +00:00
J. Ryan Stinnett
dea919f6ee
Merge pull request #3953 from matrix-org/jryans/verif-toast-details-2
...
Add new session verification details dialog
2020-01-28 11:50:03 +00:00
Half-Shot
71233a5aff
liney liney come back we need you
2020-01-28 11:33:51 +00:00
Half-Shot
7c0a461cbb
Merge remote-tracking branch 'origin/develop' into hs/bridge-info-pretty
2020-01-28 11:22:02 +00:00
Michael Telatynski
c93b080434
delint
2020-01-28 11:17:53 +00:00
Half-Shot
785277d4b8
Review bits for travis
2020-01-28 11:17:51 +00:00
Michael Telatynski
657457c14b
Apply remainder of ux
2020-01-28 11:13:09 +00:00
Weblate
b628f23a6b
Merge branch 'origin/develop' into Weblate.
2020-01-28 10:16:31 +00:00
Zoe
06f7842afa
Merge pull request #3949 from matrix-org/foldleft/12079-fix-warnings-on-self
...
Fix issue where we don't notice if our own devices shouldn't be trusted
2020-01-28 10:16:27 +00:00
J. Ryan Stinnett
67358e06bf
Use annotations and imports
2020-01-28 10:10:37 +00:00
Half-Shot
bdaf9fd06d
i18n
2020-01-28 10:05:42 +00:00
Weblate
a155fa7576
Merge branch 'origin/develop' into Weblate.
2020-01-28 10:01:20 +00:00
Kévin C
23a6b44fe7
Translated using Weblate (French)
...
Currently translated at 100.0% (2073 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-28 10:01:20 +00:00
J. Ryan Stinnett
6a9786e202
Merge pull request #3951 from matrix-org/jryans/comp-sec-body
...
Add separate component for post-auth security flows
2020-01-28 10:01:13 +00:00
J. Ryan Stinnett
d014c5239b
Add new session verification details dialog
...
This gives more info on the session you're about to verify, including device
name and ID.
Fixes https://github.com/vector-im/riot-web/issues/11977
2020-01-27 23:16:26 +00:00
Weblate
c2c90a0fe5
Merge branch 'origin/develop' into Weblate.
2020-01-27 22:39:53 +00:00
catborise
7effd22f6b
Translated using Weblate (Turkish)
...
Currently translated at 73.4% (1521 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-27 22:39:53 +00:00
Travis Ralston
a168461e8b
Merge pull request #3952 from matrix-org/travis/settings-unwatch
...
Add more logging to settings watchers
2020-01-27 22:39:47 +00:00
Travis Ralston
2a1407a531
Add more logging to settings watchers
...
To try and track leaks versus spam.
Fixes https://github.com/vector-im/riot-web/issues/12094 (it's not leaking, probably)
2020-01-27 15:36:12 -07:00
J. Ryan Stinnett
89f110f60a
Add separate component for post-auth security flows
...
Instead of twisting `AuthBody`, this adds a new component for the different
styling of post-auth security flows. This also makes them fixed width and
adjusts padding to match designs.
2020-01-27 22:28:07 +00:00
Weblate
d87f9375cf
Merge branch 'origin/develop' into Weblate.
2020-01-27 19:55:33 +00:00
Joshua Dietz
68bf646d03
Translated using Weblate (German)
...
Currently translated at 76.5% (1586 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2020-01-27 19:55:33 +00:00
Besnik Bleta
dbf0c5b4c3
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2066 of 2073 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-27 19:55:28 +00:00
J. Ryan Stinnett
f3fc95296e
Merge pull request #3944 from stoically/develop
...
Use https for recaptcha for all non-http protocols
2020-01-27 19:55:23 +00:00
stoically
ff195381e9
Use https for recaptcha for all non-http protocols
...
Signed-off-by: stoically <stoically@protonmail.com>
2020-01-27 18:56:55 +01:00
Michael Telatynski
db1d3c091e
Error handle the no QR verif case better
2020-01-27 17:21:31 +00:00
Michael Telatynski
ca5d4d88a2
Style the QR code
2020-01-27 17:17:05 +00:00
Zoe
1964e18315
Fix issue where we don't notice if our own devices shouldn't be trusted
2020-01-27 16:40:56 +00:00
Damir Jelić
e2dd2bd950
Merge branch 'poljar/seshat-ui-pr' into develop
2020-01-27 17:18:17 +01:00
Weblate
59be4313f4
Merge branch 'origin/develop' into Weblate.
2020-01-27 16:17:38 +00:00
Tirifto
1d90600ee1
Translated using Weblate (Esperanto)
...
Currently translated at 92.3% (1897 of 2055 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-01-27 16:17:38 +00:00
Besnik Bleta
40ec6d47a6
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2048 of 2055 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-27 16:17:35 +00:00
Damir Jelić
ab8ea52266
EventIndexPanel: Make sure links get opened in a new tab.
2020-01-27 16:50:33 +01:00
Michael Telatynski
50b491d7e5
post merge fix
2020-01-27 15:48:19 +00:00
Michael Telatynski
ddb0f06005
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration
...
Conflicts:
src/components/views/right_panel/VerificationPanel.js
2020-01-27 15:46:38 +00:00
Damir Jelić
e38f1191a5
ManageEventIndex: Clarify that we're currently not downloading any messages.
2020-01-27 15:51:19 +01:00
Half-Shot
5851b10f72
strings
2020-01-27 14:44:11 +00:00
Half-Shot
4d83288f4e
linting
2020-01-27 14:42:46 +00:00
Damir Jelić
7e0ab2f0a3
DisableEventIndexDialog: Turn the cancel button red.
2020-01-27 15:28:43 +01:00
Half-Shot
c0d1298c4f
Factor out into BridgeTile
2020-01-27 14:05:22 +00:00
Zoe
e224150190
detail pass on DMs
2020-01-27 12:17:12 +00:00
David Baker
1ab91d1d74
Merge pull request #3943 from matrix-org/dbkr/kill_lingering_verification_toast
...
Stop rogue verification toast if you verify during login
2020-01-27 11:17:55 +00:00
David Baker
6737523b1c
Merge pull request #3942 from matrix-org/dbkr/show_incoming_verifications_in_complete_security
...
Show incoming verification requests in the 'complete security' phase
2020-01-27 11:17:16 +00:00
David Baker
11de92b9a9
hopefully informative comment
2020-01-27 11:07:55 +00:00
David Baker
1356b61276
Merge pull request #3941 from matrix-org/dbkr/dismiss_logged_out_device_toasts
...
Dismiss logged out device toasts
2020-01-27 10:25:20 +00:00
David Baker
e50ed95edf
English
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-27 10:17:16 +00:00
David Baker
d5ac37a4ab
Merge pull request #3940 from matrix-org/dbkr/e2e_upgrade_toast
...
Verification nag toasts
2020-01-27 10:16:18 +00:00
David Baker
8c4c79adde
i18n
2020-01-27 10:05:42 +00:00
David Baker
43173824d3
Capitalisation
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-27 09:44:39 +00:00
David Baker
ebb70ca9fb
English
...
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
2020-01-27 09:44:12 +00:00
Weblate
d418ab8e64
Merge branch 'origin/develop' into Weblate.
2020-01-27 09:43:40 +00:00
David Baker
08b685d04f
Merge pull request #3939 from matrix-org/dbkr/remember_password_bootstrap
...
Remember password for e2e bootstrapping
2020-01-27 09:43:35 +00:00
Weblate
3ba56f8c94
Merge branch 'origin/develop' into Weblate.
2020-01-27 09:42:52 +00:00
catborise
ca774f45fe
Translated using Weblate (Turkish)
...
Currently translated at 73.8% (1513 of 2050 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-27 09:42:52 +00:00
Tirifto
13ba90a054
Translated using Weblate (Esperanto)
...
Currently translated at 90.1% (1848 of 2050 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2020-01-27 09:42:52 +00:00
Michael Telatynski
acf09a004f
Merge pull request #3946 from matrix-org/t3chguy/emoji
...
fix compound emoji
2020-01-27 09:42:44 +00:00
Michael Telatynski
a4bbe2ba64
fix compound emoji
2020-01-26 22:17:31 +00:00
Besnik Bleta
49cdbc9ebe
Translated using Weblate (Albanian)
...
Currently translated at 99.7% (2043 of 2050 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2020-01-26 17:23:20 +00:00
David Baker
086e43e584
comments ftw
2020-01-25 21:30:42 +00:00
David Baker
f851f976e7
Stop rogue verification toast if you verify during login
...
Fixes https://github.com/vector-im/riot-web/issues/12057
2020-01-25 21:26:43 +00:00
David Baker
9e38c62791
Show incoming verification requests in the 'complete security' phase
...
If you click to verify your new sign in on another device, actually
show the verification request on the 'complete security' screen.
2020-01-25 20:42:45 +00:00
David Baker
7169a84449
Dismiss toasts for logged out devices
2020-01-25 17:08:31 +00:00
David Baker
8c5fd5c77e
Verification nag toasts
...
Implement the three differenty cases for this session, and also fix
ones for other sessions which had the wrong copy.
Fixes https://github.com/vector-im/riot-web/issues/11220
2020-01-25 16:52:12 +00:00
David Baker
437b45f8a6
Remember password for e2e bootstrapping
...
Fixes https://github.com/vector-im/riot-web/issues/12046
2020-01-25 15:28:06 +00:00
Weblate
369636277f
Merge branch 'origin/develop' into Weblate.
2020-01-25 12:40:31 +00:00
Kévin C
c96f82cd8b
Translated using Weblate (French)
...
Currently translated at 100.0% (2050 of 2050 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2020-01-25 12:40:31 +00:00
Jeff Huang
e710607a72
Translated using Weblate (Chinese (Traditional))
...
Currently translated at 100.0% (2050 of 2050 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2020-01-25 12:40:29 +00:00
Osoitz
440b3fd1fd
Translated using Weblate (Basque)
...
Currently translated at 100.0% (2050 of 2050 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2020-01-25 12:40:27 +00:00
David Baker
988ae14d35
Merge pull request #3937 from matrix-org/dbkr/e2esetup
...
Setup flow for cross-signing on login / registration
2020-01-25 12:40:17 +00:00
Weblate
6895ad1009
Merge branch 'origin/develop' into Weblate.
2020-01-24 22:39:14 +00:00
J. Ryan Stinnett
204b7d3362
Merge pull request #3936 from matrix-org/jryans/hide-default-enc-algo
...
Hide default encryption algorithm
2020-01-24 22:39:08 +00:00
Weblate
cf08aa2b0e
Merge branch 'origin/develop' into Weblate.
2020-01-24 22:36:49 +00:00
catborise
662c723bf3
Translated using Weblate (Turkish)
...
Currently translated at 73.7% (1515 of 2056 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
2020-01-24 22:36:49 +00:00
Szimszon
95df8b9bb7
Translated using Weblate (Hungarian)
...
Currently translated at 99.8% (2052 of 2056 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2020-01-24 22:36:47 +00:00
J. Ryan Stinnett
9991a544aa
Resolve default export warnings from Webpack
...
Webpack was printing several warnings about missing default exports,
particularly from components, where we auto-generate a default import via the
component index.
As part of this, the emoji picker recent handling (which is not a component) is
moved elsewhere to avoid the generated import.
2020-01-24 22:26:34 +00:00
David Baker
3d7137d4ad
Setup flow for cross-signing on login / registration
...
Still outstanding:
* Keep password from login / registration
* Confirmation on skip button
Fixes https://github.com/vector-im/riot-web/issues/11902
2020-01-24 19:11:57 +00:00
J. Ryan Stinnett
bf0e1efce8
Hide default encryption algorithm
...
When the default encryption algorithm is used, we hide it to remove some jargon
from the app. For any other algorithm, we continue showing it and add
"unrecognised".
Fixes https://github.com/vector-im/riot-web/issues/8829
2020-01-24 17:53:33 +00:00