Commit graph

1104 commits

Author SHA1 Message Date
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
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
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
mattyatea
6f964f56cc
fix: unusedなやつ消したり
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-19 22:51:25 +09:00
mattyatea
f5658cd47d
Merge remote-tracking branch 'mi-dev/develop' into emoji-request
# Conflicts:
#	package.json
2023-10-19 22:34:59 +09:00
mattyatea
7149961f33
fix: iroiro
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>

カスタム絵文字一覧を一覧、新着、申請中に分離

(cherry picked from commit 5c464cd1bc177f0276397a686160c5c77e774d10)

fix: 絵文字管理画面の表示不具合の修正

(cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af)
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>

Fix:draftが2重に宣言されてた

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-10-19 22:18:31 +09:00
tar_bin
08311ece41
Feat:絵文字申請機能の追加 2023-10-19 22:18:30 +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
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
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
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
mattyatea
81ee7d9938
fix 2023-10-16 21:46:52 +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
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
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
4c7cd47fb6 fix: 絵文字管理画面の表示不具合の修正
(cherry picked from commit 5300ff763bb008699b35dc6e219b50ac1c4fd7af)
2023-10-14 12:38:52 +09:00
tar_bin
51313e7ec2 fix: ドラフトの絵文字は該当するキーを入力されても表示しないように修正
(cherry picked from commit f332fbc47eabc373e292076078ad673d72e6a5c9)
2023-10-14 12:38:40 +09:00
tar_bin
ffa81260ac 絵文字の登録リクエスト機能の追加
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
2023-10-14 12:38:20 +09:00
mattyatea
120efff6c1 difk 2023-10-13 07:26:27 +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
6ad8fd3d4f bugfix 2023-10-11 06:19:14 +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
f5e72f7d3e 🎨 CWボタンを大きく 2023-10-10 18:08:54 +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
6ff98846e6 fix(backend): 「ファイル付きのみ」のTLでファイル無しの新着ノートが表示される
Fix #11939
2023-10-09 17:48:09 +09:00