Merge branch 'develop' of https://github.com/syuilo/misskey into develop (351b2360) · Commits · Dima Krasner / Sharkey · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Sharkey
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

351b2360

Commit 351b2360 authored 5 years ago by syuilo

Downloads
- Plain Diff

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

parents e9251deb 047a46d9

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

locales/ja-JP.yml 1 addition, 0 deletions

locales/ja-JP.yml
migration/1562422242907-PasswordLessLogin.ts 13 additions, 0 deletions

migration/1562422242907-PasswordLessLogin.ts
src/client/app/common/views/components/settings/2fa.vue 16 additions, 0 deletions

src/client/app/common/views/components/settings/2fa.vue
src/client/app/common/views/components/signin.vue 5 additions, 1 deletion

src/client/app/common/views/components/signin.vue
src/models/entities/user-profile.ts 5 additions, 0 deletions

src/models/entities/user-profile.ts
src/models/repositories/user.ts 1 addition, 1 deletion

src/models/repositories/user.ts
src/server/api/endpoints/i/2fa/password-less.ts 21 additions, 0 deletions

src/server/api/endpoints/i/2fa/password-less.ts
src/server/api/private/signin.ts 28 additions, 8 deletions

src/server/api/private/signin.ts

with 90 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment