usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,641 Commits 336 Branches 1,012 Tags 293 MiB
Commit Graph

1535 Commits

Author SHA1 Message Date
mattyatea 781cd5dd6d fix 2023-10-18 23:21:14 +09:00
mattyatea 6cc503dfc9 fix 2023-10-18 23:14:25 +09:00
mattyatea 80d652746d remove hybrid-all-timeline and update 2023-10-18 22:40:40 +09:00
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 81182b8612 Feat:emoji folder 2023-10-18 20:51:43 +09:00
mattyatea a3743a0622 Feat:emoji folder 2023-10-18 17:42:06 +09:00
syuilo 52a82ac193 Update about-misskey.vue 2023-10-18 10:07:21 +09:00
syuilo 145c5c8b2b update deps 2023-10-18 09:43:59 +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
syuilo 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
mattyatea 81ee7d9938
fix 2023-10-16 21:46:52 +09:00
mattyatea c59a31375e
Merge remote-tracking branch 'mi-dev/develop' into emoji-request 2023-10-16 21:01:02 +09:00
syuilo 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
syuilo 3ebed5aa3e feat: local-only antenna 
Resolve #11869
 2023-10-16 15:06:00 +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 4abecb2bc1 rename 2023-10-14 16:38:38 +09:00
mattyatea da0c22ece6 fix 2023-10-14 13:37:50 +09:00
mattyatea 830c952e3d Update navbar.ts 2023-10-14 12:40:40 +09:00
mattyatea f9efc37eb1 絵文字申請 2023-10-14 12:39:11 +09:00
tar_bin ad27562269 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 2023-10-14 12:39:11 +09:00
tar_bin 40979b0aa5 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 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
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 51313e7ec2 fix: ドラフトの絵文字は該当するキーを入力されても表示しないように修正 
(cherry picked from commit f332fbc47eabc373e292076078ad673d72e6a5c9)
 2023-10-14 12:38:40 +09:00
tar_bin b138752ccb fix: 絵文字を追加した後に画像のリンクがエラーになる不具合の集背 
(cherry picked from commit d23cc54a11ef1a1fe1d06bda4cc1b15e29638ed7)
 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
syuilo 096fa16c4c enhance(frontend): TLの返信表示オプションを記憶するように 
Resolve #12016
 2023-10-13 16:49:56 +09:00
syuilo 04908bc90c .js 2023-10-13 16:42:57 +09:00
mattyatea 120efff6c1 difk 2023-10-13 07:26:27 +09:00
mattyatea 79876ab3ac fix 2023-10-12 18:09:48 +09:00
mattyatea 40469aa0ce 逆張りモードの実装 2023-10-12 18:02:55 +09:00
mattyatea 592c6e60a9 色々fix 2023-10-12 15:25:41 +09:00
mattyatea bffe140ab0 ruby 2023-10-12 12:54:09 +09:00
mattyatea 2d6d1250be Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	packages/backend/src/server/api/stream/channels/local-timeline.ts
#	packages/frontend/src/pages/timeline.vue
 2023-10-11 18:53:37 +09:00
syuilo 7132958948 fix(frontend): 絵文字ピッカーで横に長いカスタム絵文字が見切れる問題を修正 2023-10-11 17:58:40 +09:00
syuilo 7a8d5e5840 enhance: ローカルタイムライン、ソーシャルタイムラインで返信を含むかどうか設定可能に 
Resolve #12001
 2023-10-11 10:15:44 +09:00
mattyatea 2e7c034b99 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	CHANGELOG.md
#	packages/backend/src/server/api/endpoints/channels/timeline.ts
 2023-10-11 06:22:57 +09:00
mattyatea 6ad8fd3d4f bugfix 2023-10-11 06:19:14 +09:00
syuilo 51b6a012a5 fix(frontend): ユーザープロフィールページでセンシティブなメディアが隠されない問題を修正 2023-10-10 19:49:25 +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
syuilo f5e72f7d3e 🎨 CWボタンを大きく 2023-10-10 18:08:54 +09:00