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

Symmetric backup #1775

Merged
merged 14 commits into from
Jul 9, 2021
Merged

Symmetric backup #1775

merged 14 commits into from
Jul 9, 2021

Conversation

uhoreg
Copy link
Member

@uhoreg uhoreg commented Jul 7, 2021

@uhoreg uhoreg mentioned this pull request Jul 7, 2021
Closed
@uhoreg uhoreg marked this pull request as ready for review July 8, 2021 15:20
@uhoreg uhoreg requested a review from a team July 8, 2021 15:21
@t3chguy
Copy link
Member

t3chguy commented Jul 8, 2021

You will need to rebase against latest develop as Dave landed some TSification

@uhoreg
Copy link
Member Author

uhoreg commented Jul 8, 2021

Argh! I just merged in develop last night! 😛

t3chguy
t3chguy reviewed Jul 8, 2021
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.

Looks very sane other than the merge conflicts and small nits

src/crypto/aes.ts Show resolved Hide resolved
src/crypto/backup.ts Outdated Show resolved Hide resolved
src/crypto/backup.ts Outdated Show resolved Hide resolved
src/crypto/backup.ts Outdated Show resolved Hide resolved
src/crypto/backup.ts Outdated Show resolved Hide resolved
src/crypto/keybackup.ts Outdated Show resolved Hide resolved
src/crypto/key_passphrase.ts Outdated Show resolved Hide resolved
@uhoreg uhoreg requested a review from t3chguy July 8, 2021 23:36
t3chguy
t3chguy approved these changes Jul 9, 2021
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:

@uhoreg uhoreg merged commit 061199e into matrix-org:develop Jul 9, 2021
@ismailgulek ismailgulek mentioned this pull request Aug 4, 2022
Merged
@BillCarsonFr BillCarsonFr mentioned this pull request Oct 13, 2022
Closed
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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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