mattyatea
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
mattyatea
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
mattyatea
a3743a0622
Feat:emoji folder
2023-10-18 17:42:06 +09:00
nryeouo
d82b3a08e2
Update ja-JP.yml ( #12053 )
...
ポスト
2023-10-18 10:01:50 +09:00
anatawa12
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 f2cc4fe6
* Revert "feat: update defaultWithReplies from API"
This reverts commit 95e3cee6
* Revert "feat: add defaultWithReplies to MiUser"
This reverts commit 9f5ab14d70
.
* feat: configuring withReplies in import-following
* feat(frontend): configure withReplies
* fix(frontend): incorrectly showRepliesToOthersInTimeline can be shown
* fix(backend): withReplies of following/create not working
* fix(frontend): importFollowing error
* fix: withReplies is not working with follow import
* fix(frontend): use v-model
* style: fix lint
---------
Co-authored-by: Sayamame-beans <61457993+sayamame-beans@users.noreply.github.com>
Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
2023-10-17 20:56:17 +09:00
まっちゃてぃー
198f7748ce
Merge branch 'develop' into emoji-request
2023-10-16 21:50:42 +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
mattyatea
f9efc37eb1
絵文字申請
2023-10-14 12:39:11 +09:00
mattyatea
e13dc2fec9
.
2023-10-14 12:39:11 +09:00
tar_bin
21bee2ffde
カスタム絵文字のリクエスト承認用画面の追加
...
(cherry picked from commit 94451c380458b459791fc2bb6864a3255aca03c4)
2023-10-14 12:38:40 +09:00
tar_bin
bf9089209d
カスタム絵文字一覧を一覧、新着、申請中に分離
...
(cherry picked from commit 5c464cd1bc177f0276397a686160c5c77e774d10)
2023-10-14 12:38:40 +09:00
tar_bin
d607f34380
絵文字ダイアログの不具合の修正
...
(cherry picked from commit c9d6c17353a663bf68cdea9bcef100f5de5edb68)
2023-10-14 12:38:37 +09:00
tar_bin
ffa81260ac
絵文字の登録リクエスト機能の追加
...
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:38:20 +09:00
mattyatea
40469aa0ce
逆張りモードの実装
2023-10-12 18:02:55 +09:00
mattyatea
592c6e60a9
色々fix
2023-10-12 15:25:41 +09:00
mattyatea
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
syuilo
373c2af46a
clean up
2023-10-10 18:11:58 +09:00
かっこかり
af1087aed4
Feat:「ファイルの詳細」ページを追加 ( #11995 )
...
* (add) ファイルビューア
* Update Changelog
* 既存のAPIを利用
* run api extratctor
* Change i18n
* (add) ページに関する説明を追加
* Update CHANGELOG
* (fix) design, classes
2023-10-10 10:43:43 +09:00
mattyatea
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
mattyatea
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
mattyatea
abb79a0b36
ユーザーのページでノートを表示するかハイライトを表示するか決められるようにした
2023-10-07 10:40:08 +09:00
mattyatea
c3ced9b75f
Revert "revert: note editing"
...
This reverts commit b4032988
2023-10-07 07:42:27 +09:00
mattyatea
2bb86104f6
なんとなくTLを見れるようにした
2023-10-07 07:15:13 +09:00
mattyatea
560482315b
Merge remote-tracking branch 'misskey-original/develop' into timeline-toka
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/admin/emoji/add.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/MkNote.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/pages/timeline.vue
# pnpm-lock.yaml
2023-10-07 04:15:59 +09:00
mattyatea
696417140f
リモートユーザーの情報更新簡単にした
2023-10-06 08:35:41 +09:00
mattyatea
c345383374
ドライブで複数選択できるようにした
2023-10-06 08:01:42 +09:00
Camilla Ett
e4ade46a2d
fix(frontend): クライアント設定から13.7.0で削除されたチャット機能に関するサウンド設定を削除 ( #11912 )
...
* fix(frontend): クライアント設定から13.7.0で削除されたチャット機能に関するサウンド設定を削除
* fix(frontend): 各localesからsfx/chat sfx/chatbgを削除
2023-10-04 20:17:05 +09:00
syuilo
b40329887f
revert: note editing
2023-10-04 12:05:01 +09:00
syuilo
17b83ff4c1
enhance: TLキャッシュ容量を設定できるように
2023-10-04 08:46:27 +09:00
syuilo
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
mattyatea
ac1367a0b9
TLの絞り込み保存できるようにした
2023-09-30 19:02:17 +09:00
mattyatea
db20241627
fix 虚無ボタン
2023-09-30 11:31:59 +09:00
mattyatea
b96c76b2c5
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# package.json
2023-09-30 10:24:26 +09:00
syuilo
392de4df36
enhance: ノートの翻訳機能の利用可否をロールで設定可能に
...
Resolve #11923
2023-09-30 07:54:11 +09:00
mattyatea
582a6948e5
いいかんじ
2023-09-29 23:18:18 +09:00
mattyatea
7dbbfb657c
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# CHANGELOG.md
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/ui/deck/tl-column.vue
# pnpm-lock.yaml
2023-09-29 23:08:01 +09:00
syuilo
e5c339b86a
enhance(frontend): タイムラインでファイルが添付されたノートのみ表示するオプションを追加
2023-09-29 16:56:17 +09:00
syuilo
9771f1c435
enhance: improve moderation log
2023-09-29 13:26:11 +09:00
syuilo
b9da1415a5
feat: 通知の受信設定を強化
2023-09-29 11:29:54 +09:00
syuilo
2438c047a7
enhance: 編集されたノートかどうか分かるように
2023-09-28 21:06:14 +09:00
mattyatea
b2df78ffcd
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# packages/frontend/src/components/MkPostForm.vue
2023-09-28 18:13:48 +09:00
syuilo
c106db89e1
feat: note edit
2023-09-28 17:21:16 +09:00
mattyatea
81f56f08b7
Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
...
# Conflicts:
# 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/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/ui/deck/deck-store.ts
2023-09-28 16:11:39 +09:00
syuilo
eb740e2c72
enhance: タイムラインからRenoteを除外するオプションを追加
2023-09-28 11:41:41 +09:00
syuilo
055464a624
enhance: improve moderation log
2023-09-28 10:02:05 +09:00
mattyatea
2b72034847
mfmのやつ
2023-09-27 16:40:32 +09:00
mattyatea
a6ae84df71
Merge remote-tracking branch 'misskey-dev/master' into prismisskey
...
# Conflicts:
# package.json
2023-09-25 21:13:56 +09:00
mattyatea
b8c4c09e59
公開範囲、見やすく。
2023-09-25 21:12:22 +09:00