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

chore: merge passkeys/webauthn docs #1878

Merged
merged 3 commits into from
Sep 19, 2024
Merged

chore: merge passkeys/webauthn docs #1878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ceda684
chore: merge passkeys/webauthn docs
vinckr Sep 18, 2024
3f669c7
chore: fix links
vinckr Sep 18, 2024
62267a8
Merge branch 'master' into vinckr/sidebar-2024-pt2
vinckr Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/kratos/bring-your-own-ui/15_custom-ui-ory-elements.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ performing the login flow.

These pages are dynamic and will show relevant fields based on your Ory Network project configuration. To see the pages change,
edit your project's [Identity Schema](../manage-identities/05_identity-schema.mdx) or try changing adjusting project settings and
enable [passwordless](../passwordless/01_webauthn.mdx) flows.
enable [passwordless](../passwordless/05_passkeys.mdx) flows.

#### Registration

Expand Down
4 changes: 2 additions & 2 deletions docs/kratos/mfa/01_overview.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ Authentication methods are classified into factors:

:::info

When you enable [passwordless authentication with WebAuthn](../passwordless/01_webauthn.mdx), WebAuthn is not considered as a
second authentication factor.
When you enable [passwordless authentication with WebAuthn or Passkeys](../passwordless/05_passkeys.mdx), it is not considered as
a second authentication factor.

:::

Expand Down
162 changes: 0 additions & 162 deletions docs/kratos/passwordless/01_webauthn.mdx
View file
Open in desktop

This file was deleted.

Loading
Loading