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
a8dc6d08b1
update deps
2023-10-28 12:31:18 +09:00
cc5037cb85
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/frontend/package.json
2023-10-23 19:29:34 +09:00
fdeee5dd05
update deps
2023-10-23 09:20:55 +09:00
ec5bb48d6b
Merge remote-tracking branch 'misskey-original/develop' into develop
2023-10-22 13:15:38 +09:00
4eaa02d25f
enhance: improve avatar decoration
2023-10-22 13:02:24 +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
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
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
d421670b54
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# pnpm-lock.yaml
2023-10-20 09:55:24 +09:00
cc256f117e
update deps
2023-10-19 19:51:59 +09:00
9afcdd10ed
UserLite.nameにnullが入りうるのを型で明示 ( #12073 )
...
* UserLite.nameにnullが入りうるのを型で明示
* ドキュメントの追従
2023-10-19 19:33:45 +09:00
87d49b5bbf
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
2023-10-19 16:43:24 +09:00
30efd932a5
enhance: nyaizeはクライアントで表示時に行うように
...
Resolve #12030
2023-10-19 11:42:17 +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
eacb74cb44
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/entities/NoteEntityService.ts
# packages/backend/src/models/Note.ts
# packages/backend/src/server/api/endpoints/roles/notes.ts
# packages/backend/src/server/api/stream/channels/global-timeline.ts
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/backend/src/server/api/stream/channels/local-timeline.ts
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/store.ts
2023-10-18 21:22:51 +09:00
5a3c6575dd
新規にフォローした人のwithRepliesをtrueにする機能を追加 ( #12048 )
...
* feat: add defaultWithReplies to MiUser
* feat: use defaultWithReplies when creating MiFollowing
* feat: update defaultWithReplies from API
* feat: return defaultWithReplies as a part of $i
* feat(frontend): configure defaultWithReplies
* docs(changelog): 新規にフォローした人のをデフォルトでTL二追加できるように
* fix: typo
* style: fix lint failure
* chore: improve UI text
* chore: make optional params of UserFollowingService.follow() object
* chore: UserFollowingService.follow() accept withReplies
* chore: add withReplies to MiFollowRequest
* chore: process withReplies for follow request
* feat: accept withReplies on 'following/create' endpoint
* feat: store defaultWithReplies in client store
* Revert "feat: return defaultWithReplies as a part of $i"
This reverts commit f2cc4fe695e3cee69f5ab14d70
2023-10-17 20:56:17 +09:00
e9db0680c4
update deps
2023-10-17 09:04:17 +09:00
198f7748ce
Merge branch 'develop' into emoji-request
2023-10-16 21:50:42 +09:00
c59a31375e
Merge remote-tracking branch 'mi-dev/develop' into emoji-request
2023-10-16 21:01:02 +09:00
9338ab461e
update deps
2023-10-16 20:13:05 +09:00
5efd01ba70
feat: サーバーサイレンス機能を追加 ( #12031 )
...
* feat : サーバーサイレンスを追加
* Update CHANGELOG.md
* Update CHANGELOG.md
* Update locale
* Update instance-info.vue
* update misskey-js.api.md
* lint fix
* migration fix
* 既存のものを使うように
* fix
* 色々直した
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/components/MkInstanceCardMini.vue
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* fix: サイレンスされてるサーバーからの投稿は全部ホームにする
* fix: undefinedでfalseを返すようにした
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-16 20:11:27 +09:00
3ebed5aa3e
feat: local-only antenna
...
Resolve #11869
2023-10-16 15:06:00 +09:00
1a84ab3289
update misskey-js.api.md
2023-10-14 16:32:18 +09:00
ffa81260ac
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:38:20 +09:00
d691a130e2
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkNote.vue
2023-10-10 18:32:52 +09:00
cf6e53b2ac
update deps
2023-10-10 16:26:48 +09:00
cbd9a16047
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/notes/local-timeline.ts
# packages/backend/src/server/api/endpoints/notes/timeline.ts
# pnpm-lock.yaml
2023-10-09 21:24:33 +09:00
13dbfef9f8
update deps
2023-10-09 20:55:40 +09:00
dd4ecf845c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/stream/channels/global-timeline.ts
# packages/backend/src/server/api/stream/channels/home-timeline.ts
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/backend/src/server/api/stream/channels/local-timeline.ts
2023-10-09 19:46:43 +09:00
4f20c87186
lint fixes
2023-10-09 13:32:41 +09:00
cba5f494ff
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/misskey-js/etc/misskey-js.api.md
2023-10-08 21:57:02 +09:00
4bbfc98883
Feat: タイムライン更新中に広告を挿入 ( #11989 )
...
* Feat: タイムライン更新中に広告を挿入
* 翻訳を変更
* Run api extractor
* fix api extractor
* Update locales/ja-JP.yml
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* confirm -> mkinfo
* MkInputにmin, maxを指定できるように
* 負の値が指定されたら何もしない
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-08 17:56:44 +09:00
b09bfd5ad2
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/notes/global-timeline.ts
# packages/backend/src/server/api/endpoints/notes/local-timeline.ts
# packages/backend/src/server/api/endpoints/notes/timeline.ts
# packages/misskey-js/etc/misskey-js.api.md
2023-10-07 20:19:36 +09:00
5e8c0deab3
プライバシーポリシー・運営者情報のリンクを追加 ( #11925 )
...
* 運営者情報・プライバシーポリシーリンクを追加
* Update Changelog
* Run api extractor
* プライバシーポリシー・利用規約の同意をまとめる
* Update Changelog
* fix lint
* fix
* api extractor
* improve design
* nodeinfoにプライバシーポリシー・運営者情報を追加
2023-10-07 13:13:13 +09:00
c3ced9b75f
Revert "revert: note editing"
...
This reverts commit b4032988
2023-10-07 07:42:27 +09:00
95dc70021f
update deps
2023-10-06 17:19:17 +09:00
0dbf5175df
enhance: improve moderation log
2023-10-04 19:55:35 +09:00
b40329887f
revert: note editing
2023-10-04 12:05:01 +09:00
6277a5545c
feat: improve tl performance ( #11946 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* Update NoteCreateService.ts
* wip
* Update user-notes.ts
* wip
* wip
* wip
* Update NoteCreateService.ts
* wip
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* Update timeline.ts
* wip
* Update timelines.ts
* Update timelines.ts
* Update timelines.ts
* wip
* wip
* wip
* Update timelines.ts
* Update misskey-js.api.md
* Update timelines.ts
* Update timelines.ts
* wip
* wip
* wip
* Update timelines.ts
* wip
* Update timelines.ts
* wip
* test
* Update activitypub.ts
* refactor: UserListJoining -> UserListMembership
* Update NoteCreateService.ts
* wip
2023-10-03 20:26:11 +09:00
ac19b055c7
update deps
2023-09-29 15:11:08 +09:00
eb23fd4e60
update type
2023-09-29 15:01:13 +09:00
9771f1c435
enhance: improve moderation log
2023-09-29 13:26:11 +09:00
b9da1415a5
feat: 通知の受信設定を強化
2023-09-29 11:29:54 +09:00
2438c047a7
enhance: 編集されたノートかどうか分かるように
2023-09-28 21:06:14 +09:00
c106db89e1
feat: note edit
2023-09-28 17:21:16 +09:00
055464a624
enhance: improve moderation log
2023-09-28 10:02:05 +09:00
bd19d75c9c
enhance: improve moderation log
2023-09-25 16:03:43 +09:00
5318532a8d
enhance: improve moderation log
2023-09-25 10:29:12 +09:00
841e6ff901
improve moderation log
2023-09-24 15:40:38 +09:00
mattyatea
syuilo
かっこかり
A.Yamamoto
anatawa12
まっちゃてぃー
tar_bin