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
mattyatea
dfd491ff85
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/pages/settings/theme.vue
2024-02-09 10:14:24 +09:00
1Step621
74245df382
Enhance(frontend): フロント側でもリアクション権限のチェックをするように ( #13134 )
...
* フロント側でもリアクション権限のチェックをするように
* update CHANGELOG.md
* lint fixes
* remove unrelated diffs
* deny -> reject
denyは「(信用しないことを理由に)拒否する」という意味らしい
* allow -> accept
* EmojiSimpleにlocalOnlyを含めるように
* リアクション権限のない絵文字は打てないように(ダイアログを出すのではなく)
* regenerate type definitions
* lint fix
* remove unused locales
* remove unnecessary async
2024-02-06 16:45:21 +09:00
mattyatea
68b48bc16f
Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop
...
# Conflicts:
# CHANGELOG.md
# locales/index.d.ts
# locales/ja-JP.yml
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/server/api/EndpointsModule.ts
# packages/backend/src/server/api/endpoints.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkCustomEmojiEditLocal.vue
# packages/frontend/src/components/MkCustomEmojiEditRemote.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/emojis.emoji.vue
2023-12-23 09:30:48 +09:00
mattyatea
8fd5eb7010
draftからrequestに
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-24 16:55:22 +09:00
mattyatea
fe938bf8e6
Feat: 絵文字申請中のやつのテーブルを分けた
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-21 16:29:53 +09:00
tar_bin
08311ece41
Feat:絵文字申請機能の追加
2023-10-19 22:18:30 +09:00
tar_bin
ffa81260ac
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:38:20 +09:00
Shun Sakai
c2370a1be6
chore: 著作権とライセンスについての情報を各ファイルに追加する ( #11348 )
...
* chore: Add the SPDX information to each file
Add copyright and licensing information as defined in version 3.0 of
the REUSE Specification.
* tweak format
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-07-27 14:31:52 +09:00
syuilo
231506772a
tweak of 7ce569424
2023-05-18 20:17:32 +09:00
syuilo
7ce569424a
feat: カスタム絵文字ごとにそれをリアクションとして使えるロールを設定できるように
2023-05-18 18:45:49 +09:00
syuilo
8ae9d2eaa8
enhance: カスタム絵文字にライセンス情報を付与できるように
...
Resolve #10091
2023-03-16 15:08:48 +09:00
syuilo
5de8930058
refactor: rename schema to json-schema
2023-03-10 14:22:37 +09:00
