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

Signup approve #22

Merged
merged 4 commits into from
Oct 21, 2024
Merged

Signup approve #22

merged 4 commits into from
Oct 21, 2024

Conversation

yunochi
Copy link
Member

@yunochi yunochi commented Oct 21, 2024 •
edited
Loading

What

  • 가입 승인제 기능 구현

Why

Additional info (optional)

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md
  • (If possible) Add tests

@HotoRas @yunochi
Squashed commit of the following:
0c9ff48 
commit 0e2e4c3
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Thu Feb 8 20:17:56 2024 +0900

    マージミス

commit ef76220
Merge: 10988b2 0f7918c
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Thu Feb 8 19:02:33 2024 +0900

    Merge remote-tracking branch 'msky/develop' into user-approve

commit 10988b2
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Wed Jan 31 10:29:41 2024 +0900

    fix

commit 3c607f6
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Wed Jan 31 10:25:59 2024 +0900

    通常のAPI呼び出し時にも認証状態を確認するように

commit 7812e8b
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Wed Jan 31 10:17:08 2024 +0900

    fix

commit 0b2bf7f
Merge: bb1c63d 8aea360
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Wed Jan 31 10:13:33 2024 +0900

    Merge commit '8aea3603a6486d764656178082a8c365d569e3c3' into user-approve

commit bb1c63d
Merge: 4438184 5498ec5
Author: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date:   Tue Jan 2 15:07:17 2024 +0900

    Merge branch 'develop' into user-approve

commit 4438184
Merge: ac7e7f7 30594dd
Author: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date:   Sat Dec 30 00:26:00 2023 +0900

    Merge branch 'develop' into user-approve

commit ac7e7f7
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Sat Dec 30 00:24:45 2023 +0900

    fix type issues

commit f59198d
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Sat Dec 30 00:16:17 2023 +0900

    attempting to fix test

commit b73b816
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 20:37:43 2023 +0900

    メッセージをもっと丁寧にした

commit 00f03cd
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 19:53:55 2023 +0900

    文言を変更

commit 711fbc4
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 19:42:09 2023 +0900

    メッセージを丁寧にした

commit 64927ee
Merge: 794faa5 7948018
Author: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Date:   Fri Dec 29 19:17:52 2023 +0900

    Merge branch 'develop' into user-approve

commit 794faa5
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 19:16:42 2023 +0900

    replace icons

commit 5eefb04
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 19:12:04 2023 +0900

    fix

commit c28685c
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 18:21:48 2023 +0900

    update migration sql

commit 133c372
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:54:23 2023 +0900

    fix lint

commit 0491b18
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:53:35 2023 +0900

    fix

commit e527420
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:35:57 2023 +0900

    update misskey-js

commit eecb4d7
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:32:49 2023 +0900

    fix jp translation

commit 82cda36
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:31:34 2023 +0900

    インスタンス -> サーバー

commit a2344ce
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:29:54 2023 +0900

    fix frontend errors

commit 0ecab30
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:25:30 2023 +0900

    use native ref

commit e4cf912
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:19:40 2023 +0900

    fix url

commit a3da5ad
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:17:26 2023 +0900

    Update Changelog

commit c50fffa
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:15:44 2023 +0900

    rename

commit ea09475
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 17:09:29 2023 +0900

    fix translation for crowdin

commit d9e54bb
Author: Mar0xy <marie@kaifa.ch>
Date:   Sat Oct 21 18:39:13 2023 +0200

    upd: send email on new pending approval

commit b0ead7d
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Nov 1 13:56:14 2023 +0100

    fix: approval warning showing incorrectly on admin panel

commit 9606165
Author: Mar0xy <marie@kaifa.ch>
Date:   Fri Oct 20 00:13:21 2023 +0200

    chore: lint on SkApprovalUser

commit 38616fe
Author: Mar0xy <marie@kaifa.ch>
Date:   Fri Oct 20 00:09:38 2023 +0200

    upd: remove approvals from admin-users

    Removes approvals tab in favor of the new approvals page

commit 37a1418
Author: Mar0xy <marie@kaifa.ch>
Date:   Fri Oct 20 00:02:01 2023 +0200

    add: approval section in control panel

commit d222c79
Author: Mar0xy <marie@kaifa.ch>
Date:   Thu Oct 19 10:42:18 2023 +0200

    fix: invite code not being marked as used

    Fixes an issue where if approval and invite were enabled the code would stay as unused

commit 576e138
Author: Mar0xy <marie@kaifa.ch>
Date:   Thu Oct 19 10:38:46 2023 +0200

    fix: system users not being set to approved on creation

commit d71e823
Author: Mar0xy <marie@kaifa.ch>
Date:   Thu Oct 19 10:37:40 2023 +0200

    upd: don't show approved badge on remote users

commit 71756db
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 23:50:43 2023 +0200

    fix: all users being marked as not approved on cards

commit 345e1fc
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 23:39:48 2023 +0200

    upd: show warning in control panel if users are awaiting approval

commit 2b0cc59
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 23:30:44 2023 +0200

    upd: add color to non-approved user cards

commit c597700
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 16:49:28 2023 +0900

    fix

commit 3a52183
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 21:32:28 2023 +0200

    fix: set remote users to approved on updates

commit 1ca0d33
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 21:24:34 2023 +0200

    fix: modlog not showing text on approve

commit 75e5f5a
Author: kakkokari-gtyih <daisho7308+f@gmail.com>
Date:   Fri Dec 29 16:44:28 2023 +0900

    update api types

commit 030177a
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 20:56:41 2023 +0200

    upd: mark remote users as approved

commit 181a946
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 03:40:51 2023 +0200

    upd: add `Not Approved` state sorter to Users tab

commit 4cbe0ca
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 03:21:06 2023 +0200

    upd: handle email signups properly with approval enabled

commit e16433b
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 03:00:48 2023 +0200

    add: locales for approval feature

commit f69b50a
Author: Mar0xy <marie@kaifa.ch>
Date:   Wed Oct 18 02:41:36 2023 +0200

    add: Require Approval for Signup

(cherry picked from commit 736c808)

Fixup stage 1

JSON 수정 더 해야함
빡치네

(cherry picked from commit dbd3028)

Fixup stage 2 [Ready to first check]

(cherry picked from commit effcdaa)

um

(cherry picked from commit 2436087)

Fix: 코드 리뷰 반영

(cherry picked from commit fd8a902)

Fix (backend): Lint issue

(cherry picked from commit 79d42fc)
@yunochi yunochi force-pushed the signup-approve branch 2 times, most recently from 8f9c05c to 7b4d27f Compare October 21, 2024 18:11
yunochi and others added 3 commits October 22, 2024 03:21
@yunochi
Fix: signup-approve ..
73a49b1 
- state enum의 approved 를 pending 으로 변경
- metaEntityService 에서 approvalRequiredForSignup 넣어주도록 수정
- SignupRequest type에 reason 추가
- 모더레이션 페이지에서 승인 설정 바꾸면 update-meta 하도록 수정
- 기타 어쩌구 저쩌구 프론트&백앤드 버그수정
- Fix lint
- fix E2E
@Squarecat-meow @yunochi
한글 번역 추가 (yozumina)
ae28e23
@yunochi
Fix: user Approved index 추가
f984c2c
Squarecat-meow
Squarecat-meow approved these changes Oct 21, 2024
View reviewed changes
Copy link
Collaborator

@Squarecat-meow Squarecat-meow left a comment

Choose a reason for hiding this comment

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

코딩 7시간째, 유놋치가 지으신 그 모든 것을 요즈미나가 보시니 보시기에 심히 좋았더라 새벽이 되고 아침이 되니 이는 화요일이니라

@yunochi
Copy link
Member Author

yunochi commented Oct 21, 2024

フトスト !!!!!!

@yunochi yunochi merged commit e5651ec into serafuku-dev Oct 21, 2024
27 of 28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Squarecat-meow Squarecat-meow Squarecat-meow approved these changes

Assignees
No one assigned
Labels
packages/backend:test packages/backend packages/frontend packages/misskey-js
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@yunochi @Squarecat-meow @HotoRas