mattyatea
|
8c4a08c383
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
# packages/backend/src/server/api/endpoints/admin/meta.ts
# packages/backend/src/server/api/endpoints/channels/timeline.ts
# packages/backend/src/server/api/endpoints/notes/featured.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkClickerGame.vue
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkInstanceTicker.vue
# packages/frontend/src/components/MkLaunchPad.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteSimple.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkRadio.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkSwitch.vue
# packages/frontend/src/custom-emojis.ts
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/admin/other-settings.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/pages/user/index.files.vue
# packages/frontend/src/scripts/get-note-menu.ts
# packages/frontend/src/store.ts
# packages/frontend/src/ui/_common_/stream-indicator.vue
# packages/frontend/src/ui/classic.sidebar.vue
# packages/frontend/src/ui/universal.vue
# packages/frontend/src/ui/universal.widgets.vue
# packages/frontend/vite.config.ts
# packages/misskey-js/etc/misskey-js.api.md
# packages/misskey-js/src/api.types.ts
# packages/misskey-js/src/entities.ts
# packages/misskey-js/src/streaming.types.ts
|
2023-12-13 07:08:57 +09:00 |
|
mattyatea
|
da83bc315a
|
feat: 絵文字のホーム通知
|
2023-12-09 19:05:27 +09:00 |
|
mattyatea
|
7e155917e7
|
Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
# package.json
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
|
2023-10-28 16:06:07 +09:00 |
|
mattyatea
|
81ee7d9938
|
fix
|
2023-10-16 21:46:52 +09:00 |
|
mattyatea
|
c0c6b87c94
|
lint fix
|
2023-10-14 17:33:42 +09:00 |
|
mattyatea
|
57331536f2
|
lint fix
|
2023-10-14 17:00:14 +09:00 |
|
mattyatea
|
f9efc37eb1
|
絵文字申請
|
2023-10-14 12:39:11 +09:00 |
|
mattyatea
|
e13dc2fec9
|
.
|
2023-10-14 12:39:11 +09:00 |
tar_bin
|
624e5e82cd
|
feature: ナビメニューからプロフィールを削除してカスタム絵文字を追加
(cherry picked from commit 94b8cea7bb6fea37f3a5c20fb97eadc5828e1272)
|
2023-10-14 12:39:09 +09:00 |
|
tar_bin
|
4c7cd47fb6
|
fix: 絵文字管理画面の表示不具合の修正
(cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af)
|
2023-10-14 12:38:52 +09:00 |