Commit graph

1573 commits

Author SHA1 Message Date
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 8091e8b900 🎨 2023-10-22 16:16:02 +09:00
syuilo 1aeae6217e chore(frontend): tweak settings ui 2023-10-22 16:12:01 +09:00
syuilo 5cd98804a2 🎨 2023-10-22 16:08:41 +09:00
syuilo 7e80b3d4d4 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-10-22 16:05:36 +09:00
syuilo 18fb7a2080 enhance(frontend): アイコンのデコレーションを非表示にできるように 2023-10-22 16:05:32 +09:00
zyoshoka 983b1e63df
fix(frontend): 投稿フォームでのユーザー変更がプレビューに反映されるように修正 (#12022)
* fix(frontend): 投稿フォームでのユーザー変更がプレビューに反映されるように修正

* Update CHANGELOG.md
2023-10-22 15:51:48 +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 212986a3a8 Merge remote-tracking branch 'misskey-original/develop' into develop 2023-10-22 12:48:46 +09:00
syuilo fd8d253e1e 🎨 2023-10-22 09:43:55 +09:00
syuilo 845713bdbf Update about-misskey.vue 2023-10-22 09:28:59 +09:00
mattyatea 29cae2ca2a fix 2023-10-21 20:58:02 +09:00
mattyatea 8b42570499 fix 2023-10-21 20:54:02 +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
woxtu e6873fb259
Switch avatar images that depend on the animation setting (#12097) 2023-10-21 13:31:16 +09:00
mattyatea 2edbd4eca4 Fix: なんかおかしいの 2023-10-21 11:32:09 +09:00
Natsuki Ikeguchi f4970c7d2f
fix(frontend): Use opening quote in notifications (#12082)
Signed-off-by: Natsuki Ikeguchi <me@s6n.jp>
2023-10-21 07:54:28 +09:00
syuilo 42a3489bcb update deps 2023-10-20 15:46:12 +09:00
mattyatea bbf1ba6a54 Fix: mute 2023-10-20 14:39:25 +09:00
syuilo 21986a2168 enhance(frontend): 投稿されてから時間が経過しているノートであることを視覚的に分かりやすく 2023-10-20 11:51:01 +09:00
syuilo 18af290b18 chore: tweak MkNotifications 2023-10-20 11:33:33 +09:00
mattyatea 7bd7fe996c Fix: なんかReplyがおかしいの 2023-10-20 11:21:32 +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 cc256f117e update deps 2023-10-19 19:51:59 +09:00
atsuchan 7b361224f8
fix(frontend): Recieve Unrenote on streaming (#12079)
* fix(frontend): Recieve Unrenote

表示しているリノートがリノート解除されたらストリーミングで受信してすぐに消えるようにする

* fix(frontend): Recieve Unrenote lint fixing

* fix(frontend): Recieve Unrenote Decapture

Decapture忘れてたー
2023-10-19 19:36:18 +09:00
Nafu Satsuki 4d00155a42 feat: ワードミュートに該当したノートを非表示にできるように 2023-10-19 19:15:53 +09:00
mattyatea 91edf38871 Fix: 一括で選択できない 2023-10-19 18:51:21 +09:00
mattyatea 8ac5dad60b Fix: 絵文字フォルダが正常に判定されない 2023-10-19 18:50:37 +09:00
syuilo 721cbe085b fix(frontend): fix of 30efd932a5 2023-10-19 17:42:19 +09:00
mattyatea 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
syuilo 30efd932a5 enhance: nyaizeはクライアントで表示時に行うように
Resolve #12030
2023-10-19 11:42:17 +09:00
mattyatea 1b558e7243 Feat: グローバルタイムラインの表示非表示を 2023-10-19 02:17:16 +09:00
mattyatea 4f6b0ccf6b emoji 2023-10-19 01:16:11 +09:00
mattyatea 0d4a5338c8 fix 2023-10-18 23:29:14 +09:00
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