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

Feature addition: Updated MFA [Docs] #108

Merged
merged 3 commits into from
Sep 11, 2024

Conversation

chesspro13
Copy link
Contributor

@chesspro13 chesspro13 commented Sep 9, 2024

Docs for Notes MFA pull request. Feature addition: Updated MFA

@chesspro13 chesspro13 changed the title Added MFA page. Work in progress. Feature addition: Updated MFA [Docs] Sep 9, 2024
@chesspro13
Copy link
Contributor Author

@root-hal9000 are there any established conventions for the documentation?

@chesspro13 chesspro13 marked this pull request as ready for review September 9, 2024 23:25
@Alumniminium Alumniminium merged commit 0f04cf0 into TriliumNext:main Sep 11, 2024
@chesspro13
Copy link
Contributor Author

@Alumniminium I apologize, I should have clarified this better. This feature has not been implemented into the main Notes branch yet. It still has to be reviewed and approved under this PR before this PR is applicable.

@Alumniminium
Copy link
Contributor

Alumniminium commented Sep 11, 2024

@Alumniminium I apologize, I should have clarified this better. This feature has not been implemented into the main Notes branch yet. It still has to be reviewed and approved under this PR before this PR is applicable.

Ah, I figured this was important because your PR targeted main and not initial-review so I figured MFA had been merged into the latest (or next) version. I'll keep an eye on the PR on Notes, if it doesn't get merged, I'll undo this merge and rebase it into initial-review.

Either way, no harm done. Thanks for writing the documentation for this feature!

@chesspro13
Copy link
Contributor Author

@Alumniminium I apologize, I should have clarified this better. This feature has not been implemented into the main Notes branch yet. It still has to be reviewed and approved under this PR before this PR is applicable.

Ah, I figured this was important because your PR targeted main and not initial-review so I figured MFA had been merged into the latest (or next) version. I'll keep an eye on the PR on Notes, if it doesn't get merged, I'll undo this merge and rebase it into initial-review.

Either way, no harm done. Thanks for writing the documentation for this feature!

That's my bad. I didn't realize there was a branch for review. Good to know for the future!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants