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

相互リンク機能の追加 #319

Merged
merged 13 commits into from
Aug 15, 2024
Merged

Commits on Aug 14, 2024

  1. feat(profile): 相互リンク機能の追加 (MisskeyIO#675)

    (cherry picked from commit b6a5a36eaa66883e9306c782b71cb08f80cb12bc)
    # Conflicts:
    #	locales/index.d.ts
    #	locales/ja-JP.yml
    #	packages/backend/src/core/CoreModule.ts
    #	packages/backend/src/core/entities/UserEntityService.ts
    #	packages/backend/src/models/RepositoryModule.ts
    #	packages/backend/src/models/_.ts
    #	packages/backend/src/models/json-schema/user.ts
    #	packages/backend/src/server/api/endpoints/i/update.ts
    #	packages/backend/src/types.ts
    #	packages/cherrypick-js/etc/cherrypick-js.api.md
    #	packages/cherrypick-js/src/autogen/endpoint.ts
    #	packages/cherrypick-js/src/autogen/entities.ts
    #	packages/cherrypick-js/src/consts.ts
    #	packages/frontend/src/pages/admin-user.vue
    #	packages/frontend/src/pages/user/home.vue
    #	packages/frontend/src/pages/user/index.timeline.vue
    
    Co-authored-by: まっちゃてぃー。 <[email protected]>
    kozakura913 and mattyatea committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    9935d26 View commit details
    Browse the repository at this point in the history
  2. enhance(profile): 相互リンク機能の改修 (MisskeyIO#684)

    (cherry picked from commit 5a9d8a556440452bdf803c323b93098e7c716a54)
    # Conflicts:
    #	locales/ja-JP.yml
    #	packages/backend/src/core/CoreModule.ts
    #	packages/backend/src/core/RoleService.ts
    #	packages/backend/src/core/entities/UserEntityService.ts
    #	packages/backend/src/models/RepositoryModule.ts
    #	packages/backend/src/models/_.ts
    #	packages/backend/src/models/json-schema/role.ts
    #	packages/backend/src/types.ts
    #	packages/backend/test/e2e/users.ts
    #	packages/cherrypick-js/etc/cherrypick-js.api.md
    #	packages/cherrypick-js/src/autogen/endpoint.ts
    #	packages/cherrypick-js/src/autogen/entities.ts
    #	packages/cherrypick-js/src/autogen/types.ts
    #	packages/cherrypick-js/src/consts.ts
    #	packages/frontend/src/const.ts
    #	packages/frontend/src/pages/admin-user.vue
    #	packages/frontend/src/pages/user/home.vue
    #	packages/frontend/src/pages/user/index.timeline.vue
    
    Co-authored-by: まっちゃてぃー。 <[email protected]>
    kozakura913 and mattyatea committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    05d760b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    da87753 View commit details
    Browse the repository at this point in the history
  4. fix roleService

    kozakura913 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    0cf9d60 View commit details
    Browse the repository at this point in the history
  5. enhance(profile): 相互リンク機能の設定画面のデザイン修正 (MisskeyIO#690)

    (cherry picked from commit 90be6317e6cd39e82bc0b1a108fe490f0fb772a9)
    # Conflicts:
    #	locales/en-US.yml
    #	locales/ko-KR.yml
    
    Co-authored-by: まっちゃとーにゅ <[email protected]>
    kozakura913 and u1-liquid committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    82dcaeb View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    962cfcb View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    30f1bf7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    fbaac8d View commit details
    Browse the repository at this point in the history
  9. fix lint

    kozakura913 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    cf66376 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5921c6d View commit details
    Browse the repository at this point in the history
  11. fix SPDX

    kozakura913 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    ae9ecb1 View commit details
    Browse the repository at this point in the history
  12. Merge branch 'develop' into mutual_links

    # Conflicts:
    #	packages/frontend/src/components/MkLink.vue
    kozakura913 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    6838085 View commit details
    Browse the repository at this point in the history
  13. Update CHANGELOG_yojo.md

    kozakura913 committed Aug 14, 2024
    Configuration menu
    Copy the full SHA
    44be14b View commit details
    Browse the repository at this point in the history