f0d93755e9
update
2024-05-17 11:12:20 +09:00
26bb2d42f9
update
2024-05-17 01:17:16 +09:00
1947a53af6
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# README.md
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/RoleService.ts
# packages/backend/src/core/activitypub/models/ApNoteService.ts
# packages/backend/src/core/activitypub/models/ApPersonService.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/const.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
# packages/frontend/src/pages/admin/security.vue
# pnpm-lock.yaml
2024-03-05 16:38:19 +09:00
39d6af135f
enhance: 通知の履歴をリセットできるように ( #13335 )
...
* enhance: 通知の履歴をリセットできるように
* Update Changelog
* 通知欄も連動して更新するように
* revert some changes
* Update CHANGELOG.md
* Remove unused part
* fix
2024-02-29 20:03:30 +09:00
c1514ce91d
(re) update SPDX-FileCopyrightText
...
Fix #13290
2024-02-13 15:59:27 +00:00
311c2172d7
Revert "update SPDX-FileCopyrightText"
...
This reverts commit 9b5aeb76d8
2024-02-13 15:50:11 +00:00
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
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
852c5d4035
いろいろかえた
2024-01-28 07:56:32 +09:00
78a34d3de3
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/pages/timeline.vue
2024-01-23 12:38:56 +09:00
e8ba0b3f54
enhance(reversi): improve desync handling
2024-01-23 10:51:59 +09:00
f6d3fde92d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkUserSelectDialog.vue
# packages/frontend/src/components/index.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/avatar-decorations.vue
# packages/frontend/src/pages/settings/mute-block.word-mute.vue
# packages/frontend/src/pages/user/home.vue
# packages/misskey-bubble-game/src/monos.ts
2024-01-20 14:54:06 +09:00
a637b4e282
feat: reversi
...
Resolve #12962
2024-01-19 20:51:49 +09:00
eee41cc6ba
Feat: remote local timeline
2024-01-17 15:41:55 +09:00
33507e24ff
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/backend/src/postgres.ts
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/router.ts
# packages/frontend/src/ui/universal.vue
2024-01-11 21:46:28 +09:00
cf54c2ba47
feat: ranking system of bubble game
...
Resolve #12961
2024-01-11 18:13:39 +09:00
801697ccdd
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-01-08 00:40:16 +09:00
2a9db983fc
feat: export clips ( #12931 )
...
* feat: export clips
* Update CHANGELOG.md
2024-01-07 10:35:58 +09:00
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
b7f9ad1944
Merge remote-tracking branch 'misskey-mattyatea/schedule-note' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# packages/backend/src/core/RoleService.ts
# packages/frontend/src/components/MkNoteHeader.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/const.ts
# packages/frontend/src/navbar.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
2023-12-02 00:50:04 +09:00
b58d266ccd
Merge branch 'develop' into schedule-note
2023-11-20 09:31:54 +09:00
e3d8346e21
Merge remote-tracking branch 'misskey-original/develop' into develop
2023-11-19 17:56:14 +09:00
b65fd34981
tweak of 2b6f789a5b
2023-11-19 10:18:57 +09:00
2b6f789a5b
feat(moderation): モデレーターがユーザーのアイコンもしくはバナー画像を未設定状態にできる機能を追加 (MisskeyIO#222)
...
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2023-11-18 21:07:47 +09:00
36292549c5
Merge remote-tracking branch 'mi-dev/develop' into emoji-req
2023-11-15 14:24:41 +09:00
d439dd66f9
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkNotifications.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/ui/_common_/navbar.vue
# packages/frontend/src/ui/_common_/stream-indicator.vue
2023-11-15 13:32:09 +09:00
cb00b236d2
Merge branch 'develop' into schedule-note
2023-11-14 22:18:00 +09:00
2d2eefe3d4
feat: メールアドレスを使用してユーザー名を割り出す機能
...
Resolve #10158
2023-11-14 07:58:18 +09:00
22766fc7a2
`notes/schedule/create` を削除
2023-11-09 23:31:57 +09:00
4406af58f1
`/api/notes/` -> `/api/notes/schedule/`
2023-11-09 19:12:49 +09:00
540f531b6d
予約投稿の一覧表示、削除をできるようにした
...
dbに投稿内容を保存するようにした
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-09 16:09:51 +09:00
e133a6b6a4
いちおう動くようにはなった
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-06 18:15:29 +09:00
cb1005811d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteHeader.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkReactionsViewer.reaction.vue
# packages/frontend/src/components/MkUserSetupDialog.vue
# packages/frontend/src/pages/timeline.tutorial.vue
# packages/frontend/src/pages/timeline.vue
# packages/misskey-js/etc/misskey-js.api.md
2023-11-04 01:24:44 +09:00
79346272f8
feat: レジストリAPIをサードパーティから利用可能に ( #12229 )
...
* wip
* wip
* Update remove.ts
* refactor
2023-11-03 13:23:03 +09:00
ed261d3b99
Merge remote-tracking branch 'mi-dev/develop' into emoji-req
...
# Conflicts:
# packages/misskey-js/etc/misskey-js.api.md
2023-11-03 03:15:23 +09:00
10d38335f2
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/EndpointsModule.ts
# packages/frontend/src/pages/settings/general.vue
2023-11-02 16:07:27 +09:00
f62ad3ed3e
feat: notification grouping
...
Resolve #12211
2023-11-02 15:57:55 +09:00
8fd5eb7010
draftからrequestに
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-24 16:55:22 +09:00
53d250dddf
draft-update から update-draft に
...
admin/emoji/list-draft を追加
Update MkPagination.vue
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-24 15:37:43 +09:00
366ea80a06
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/package.json
# packages/frontend/src/components/MkMention.vue
# packages/frontend/src/components/global/MkAvatar.vue
# packages/frontend/src/pages/settings/general.vue
2023-10-21 20:47:50 +09:00
27a7d0bbf7
Merge remote-tracking branch 'mi-dev/develop' into emoji
...
# Conflicts:
# packages/backend/src/models/RepositoryModule.ts
# packages/misskey-js/etc/misskey-js.api.md
2023-10-21 19:56:27 +09:00
f51bca41c5
Feat: 外部サイトからテーマ・プラグインのインストールができるように ( #12034 )
...
* Feat: 外部サイトからテーマ・プラグインのインストールができるように
* Update Changelog
* Change Changelog
* Remove unnecessary imports
* Update fetch-external-resources.ts
* Update CHANGELOG.md
* Update CHANGELOG.md
2023-10-21 18:41:12 +09:00
722584bf72
すべてのフォロー中の人のwithRepliesを変える機能 ( #12049 )
...
* feat: endpoint to update all following
* feat(frontend): change show replies for all
* docs(changelog): すでにフォローしたすべての人の返信をTLに追加できるように
* fix: cancel not working
2023-10-21 18:39:19 +09:00
2c0a139da6
feat: Avatar decoration ( #12096 )
...
* wip
* Update ja-JP.yml
* Update profile.vue
* .js
* Update home.test.ts
2023-10-21 18:38:07 +09:00
fe938bf8e6
Feat: 絵文字申請中のやつのテーブルを分けた
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-21 16:29:53 +09:00
08311ece41
Feat:絵文字申請機能の追加
2023-10-19 22:18:30 +09:00
80d652746d
remove hybrid-all-timeline and update
2023-10-18 22:40:40 +09:00
c7c70c1c30
Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# packages/backend/src/core/UserFollowingService.ts
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
2023-10-18 22:37:42 +09:00
ffa81260ac
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:38:20 +09:00
592c6e60a9
色々fix
2023-10-12 15:25:41 +09:00
mattyatea
かっこかり
tamaina
syuilo
Kagami Sascha Rosylight
mattyatea
Nafu Satsuki
kakkokari-gtyih
anatawa12
tar_bin