Commit graph

6067 commits

Author SHA1 Message Date
mattyatea 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
syuilo e6c54de814 enhance(backend): RedisへのTLのキャッシュをオフにできるように 2023-10-23 15:17:25 +09:00
mattyatea cf14d90f50 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/ui/_common_/navbar.vue
2023-10-22 19:47:55 +09:00
syuilo 18fb7a2080 enhance(frontend): アイコンのデコレーションを非表示にできるように 2023-10-22 16:05:32 +09:00
mattyatea ec5bb48d6b Merge remote-tracking branch 'misskey-original/develop' into develop 2023-10-22 13:15:38 +09:00
syuilo 4eaa02d25f enhance: improve avatar decoration 2023-10-22 13:02:24 +09:00
mattyatea 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
anatawa12 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
syuilo 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
syuilo b397a72b28
New Crowdin updates (#12094)
* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Uyghur)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Croatian)

* New translations ja-jp.yml (Haitian Creole)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Chinese Simplified)
2023-10-21 13:39:12 +09:00
mattyatea 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
syuilo d9241df84d
New Crowdin updates (#12070)
* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Chinese Traditional)
2023-10-19 19:47:36 +09:00
Nafu Satsuki 4d00155a42 feat: ワードミュートに該当したノートを非表示にできるように 2023-10-19 19:15:53 +09:00
mattyatea 1b558e7243 Feat: グローバルタイムラインの表示非表示を 2023-10-19 02:17:16 +09:00
mattyatea 4a941b22a9 remove hybrid-all-timeline and update 2023-10-18 22:41:02 +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 a3743a0622 Feat:emoji folder 2023-10-18 17:42:06 +09:00
syuilo 92b49b6ebb
New Crowdin updates (#12036)
* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Thai)
2023-10-18 17:41:32 +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 624e5e82cd feature: ナビメニューからプロフィールを削除してカスタム絵文字を追加
(cherry picked from commit 94b8cea7bb6fea37f3a5c20fb97eadc5828e1272)
2023-10-14 12:39:09 +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 d26c61c5b5 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2023-10-12 12:54:43 +09:00
syuilo c2e177e37a
New Crowdin updates (#12013)
* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (Chinese Traditional)
2023-10-12 09:20:25 +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
syuilo 61ff98c8dd
New Crowdin updates (#12000)
* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Ukrainian)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Bengali)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)
2023-10-10 19:03:21 +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 57b794edfb
New Crowdin updates (#11999)
* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)
2023-10-10 18:14:09 +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 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
syuilo fce557715b
New Crowdin updates (#11980)
* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Chinese Traditional)
2023-10-09 12:37:04 +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