Commit Graph

21257 Commits (e43de26720def6f7e7a2cfc6c858d679bd2db0ec)

Author SHA1 Message Date
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
Travis Ralston f4842688f8 Add reciprocate to verification methods 2020-01-28 11:10:15 +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
J. Ryan Stinnett 805e9abb39 Flip back to develop 2020-01-27 16:00:25 +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
Zoe 0eb49c4c72
Merge pull request #3948 from matrix-org/foldleft/12035-room-decoration-design-pass-2
Remove DM icons if `feature_cross_signing` is enabled; hide padlocks in DM room headers
2020-01-27 14:15:32 +00: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
RiotRobot 7a79b78292 Merge branch 'master' into develop 2020-01-27 11:46:56 +00:00