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.

Sign up for GitHub

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

Jump to bottom

Element R: Implement requestOwnUserVerification #3503

Merged
merged 1 commit into from
Jun 26, 2023
Merged

Element R: Implement requestOwnUserVerification #3503

merged 1 commit into from
Jun 26, 2023

Conversation

richvdh
Copy link
Member

@richvdh richvdh commented Jun 23, 2023 •
edited by github-actions bot
Loading

Based on #3497

Part of element-hq/element-web#25319.

Notes: Support for interactive device verification in Element-R.

Here's what your changelog entry will look like:

✨ Features

  • Support for interactive device verification in Element-R. (#3503).

@richvdh richvdh mentioned this pull request Jun 23, 2023
Merged
@richvdh richvdh force-pushed the rav/element-r/26_requestOwnUserVerification branch from 7c8ce9b to 6f7bcde Compare June 23, 2023 15:54
@richvdh richvdh marked this pull request as ready for review June 23, 2023 16:06
@richvdh richvdh requested review from a team as code owners June 23, 2023 16:06
t3chguy
t3chguy previously approved these changes Jun 26, 2023
View reviewed changes
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

6f7bcde looks sane. In future for stacked PRs which are not in draft could you please set the base branch correctly so that the Files changed tab doesn't try to make me review multiple PRs in one fell swoop?

@t3chguy t3chguy dismissed their stale review June 26, 2023 08:52

Base branch set incorrectly

@richvdh richvdh force-pushed the rav/element-r/26_requestOwnUserVerification branch from 6f7bcde to f1d0cdc Compare June 26, 2023 11:20
@richvdh richvdh changed the base branch from develop to rav/element-r/25_get_requests_in_progress June 26, 2023 11:21
@richvdh richvdh requested a review from t3chguy June 26, 2023 11:21
@richvdh
Copy link
Member Author

richvdh commented Jun 26, 2023

@t3chguy: now rebased, PTAL

t3chguy
t3chguy approved these changes Jun 26, 2023
View reviewed changes
Copy link
Member

@t3chguy t3chguy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@richvdh richvdh merged commit 8da7565 into rav/element-r/25_get_requests_in_progress Jun 26, 2023
@richvdh richvdh deleted the rav/element-r/26_requestOwnUserVerification branch June 26, 2023 11:58
richvdh added a commit that referenced this pull request Jun 26, 2023
@richvdh
Revert "Element-R: Implement requestOwnUserVerification (#3503)"
692096e 
This reverts commit 8da7565.

oops, merged too soon
@richvdh richvdh restored the rav/element-r/26_requestOwnUserVerification branch June 26, 2023 12:01
@richvdh richvdh mentioned this pull request Jun 26, 2023
Merged
@richvdh
Copy link
Member Author

richvdh commented Jun 26, 2023

I merged this into the wrong branch, and had to revert it.

Another go, at #3508.

github-merge-queue bot pushed a commit that referenced this pull request Jun 26, 2023
@richvdh
Element-R: implement `CryptoApi.getVerificationRequestsToDeviceInProg…
96e484a 
…ress` (#3497)

* Element-R: Implement `CryptoApi.getVerificationRequestsToDeviceInProgress`

* Element-R: Implement `requestOwnUserVerification` (#3503)

* Revert "Element-R: Implement `requestOwnUserVerification` (#3503)"

This reverts commit 8da7565.

oops, merged too soon
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t3chguy t3chguy t3chguy approved these changes

@germain-gg germain-gg Awaiting requested review from germain-gg germain-gg was automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@richvdh @t3chguy