Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show incoming verification requests in in-app notifications #3661

Merged
merged 8 commits into from Nov 22, 2019

Conversation

@bwindels
Copy link
Contributor

bwindels commented Nov 22, 2019

@bwindels bwindels force-pushed the bwindels/verif-toasts branch from efabfb5 to 0f3d43e Nov 22, 2019
bwindels added 3 commits Nov 20, 2019
might merge it later on with accessible button
@bwindels bwindels force-pushed the bwindels/verif-toasts branch from 0f3d43e to 20a1a5e Nov 22, 2019
bwindels added 2 commits Nov 22, 2019
this uses a verification requests as emitted by the js-sdk with
the `crypto.verification.request` rather than a verifier as emitted
by `crypto.verification.start` as this works for both to_device and
timeline events with the changes made in the js-sdk pr.
@bwindels bwindels force-pushed the bwindels/verif-toasts branch from 20a1a5e to 8cb3620 Nov 22, 2019
bwindels added 3 commits Nov 22, 2019
@bwindels bwindels marked this pull request as ready for review Nov 22, 2019
@bwindels bwindels requested a review from matrix-org/riot-web Nov 22, 2019
@dbkr dbkr requested review from dbkr and removed request for matrix-org/riot-web Nov 22, 2019
@dbkr
dbkr approved these changes Nov 22, 2019
@bwindels bwindels merged commit 4a684d0 into develop Nov 22, 2019
7 checks passed
7 checks passed
buildkite/matrix-react-sdk Build #3181 passed (11 minutes, 35 seconds)
Details
buildkite/matrix-react-sdk/chains-end-to-end-tests Passed (6 minutes, 8 seconds)
Details
buildkite/matrix-react-sdk/eslint-lint Passed (2 minutes, 8 seconds)
Details
buildkite/matrix-react-sdk/i18n Passed (1 minute, 26 seconds)
Details
buildkite/matrix-react-sdk/karma-tests Passed (7 minutes, 34 seconds)
Details
buildkite/matrix-react-sdk/pipeline Passed (4 seconds)
Details
buildkite/matrix-react-sdk/riot-tests Passed (6 minutes, 16 seconds)
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.