mattyatea
|
71382a6f85
|
Merge remote-tracking branch 'mattyateaFork/develop' into develop
# Conflicts:
# CHANGELOG.md
# README.md
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/activitypub/models/ApNoteService.ts
# packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts
# packages/backend/src/server/api/endpoints/get-avatar-decorations.ts
# packages/backend/test/unit/entities/UserEntityService.ts
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/emoji-edit-dialog.vue
# packages/frontend/src/ui/universal.vue
|
2024-07-15 14:59:54 +09:00 |
|
mattyatea
|
4e5f16cdf9
|
Type4ny Project Initialize
|
2024-07-01 09:33:26 +09:00 |
|
tamaina
|
c1514ce91d
|
(re) update SPDX-FileCopyrightText
Fix #13290
|
2024-02-13 15:59:27 +00:00 |
|
tamaina
|
311c2172d7
|
Revert "update SPDX-FileCopyrightText"
This reverts commit 9b5aeb76d8.
|
2024-02-13 15:50:11 +00:00 |
|
mattyatea
|
5812b15cbd
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# packages/backend/src/core/QueueService.ts
# packages/frontend/src/components/global/MkFooterSpacer.vue
|
2024-02-13 05:48:07 +09:00 |
|
syuilo
|
9b5aeb76d8
|
update SPDX-FileCopyrightText
|
2024-02-12 11:37:45 +09:00 |
|
tar_bin
|
ffa81260ac
|
絵文字の登録リクエスト機能の追加
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
|
2023-10-14 12:38:20 +09:00 |
|
syuilo
|
053da10e94
|
refactor(backend): update directory structure for models
|
2023-09-20 11:33:36 +09:00 |
|