Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
25335 commits 49 branches 1047 tags 307 MiB
Commit graph

1017 commits

Author SHA1 Message Date
syuilo 82526ad4f3 CWを使用する場合、注釈を空にすることを許可しない 
Resolve #12217
 2023-11-03 08:17:35 +09:00
syuilo 7f5ad5badb enhance(frontend): tweak drive file component 
Resolve #12220
 2023-11-03 08:01:22 +09:00
syuilo 5f888809e9 clean up 2023-11-03 08:00:26 +09:00
mattyatea c2f4847428
Update MkCustomEmojiEditRequest.vue 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-03 03:17:48 +09:00
mattyatea ed261d3b99
Merge remote-tracking branch 'mi-dev/develop' into emoji-req 
# Conflicts:
#	packages/misskey-js/etc/misskey-js.api.md
 2023-11-03 03:15:23 +09:00
mattyatea 1d30c51d77
Fix: css modulesを使うように 
その他修正

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-03 03:14:50 +09:00
syuilo d20f778bd0 enhance(frontend): tweak MkNotification 2023-11-02 19:59:18 +09:00
syuilo ed699b4aed Revert "enhance(frontend): 「内容を隠す」でリアクションも隠れるように" 
This reverts commit e85b8217c0.
 2023-11-02 18:12:01 +09:00
syuilo d0d32e8846 enhance(frontend): improve pull to refresh 2023-11-02 18:07:42 +09:00
mattyatea 5335e68bde Feat:ゴリラモード 2023-11-02 16:51:03 +09:00
mattyatea 10d38335f2 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/frontend/src/pages/settings/general.vue
 2023-11-02 16:07:27 +09:00
syuilo f62ad3ed3e feat: notification grouping 
Resolve #12211
 2023-11-02 15:57:55 +09:00
mattyatea 14ee2f7e6a Revert "enhance(frontend): 「内容を隠す」でリアクションも隠れるように" 
This reverts commit e85b8217c0.
 2023-11-02 14:47:19 +09:00
mattyatea 801637ef1d Revert "🎨" 
This reverts commit e6e5bf1da4.
 2023-11-02 14:45:50 +09:00
mattyatea ba9e11870c Revert "🎨" 
This reverts commit 821633f878.
 2023-11-02 14:45:46 +09:00
mattyatea c2208fb1c5 インジケーターとか 2023-11-02 14:32:07 +09:00
mattyatea d720501c82 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkLaunchPad.vue
#	packages/frontend/src/ui/_common_/navbar-for-mobile.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/universal.vue
 2023-11-02 06:47:13 +09:00
syuilo 821633f878 🎨 2023-11-01 15:36:15 +09:00
かっこかり 5fb6847419
Feat: 未読通知数を表示できるように (#11982) 
* 未読通知数を表示できるように

* Update Changelog

* オプトインにする

* Fix lint

* (add) テスト通知のプッシュ通知を追加

* add test

* フロントエンドの表示上限を99に変更

* Make it default on

* 共通スタイルをくくりだす

* Update Changelog

* tweak

* Update UserEntityService.ts

* rename

* Update navbar-for-mobile.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-01 13:34:05 +09:00
syuilo e85b8217c0 enhance(frontend): 「内容を隠す」でリアクションも隠れるように 
Resolve #12199
 2023-11-01 11:23:23 +09:00
syuilo d6fe897923 perf(frontend): ノート表示時のMFMパース処理を減らす 2023-11-01 10:23:20 +09:00
mattyatea 56ea04cb0b Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/_common_/common.ts
 2023-11-01 05:23:55 +09:00
syuilo e6e5bf1da4 🎨 2023-10-31 13:46:58 +09:00
mattyatea 9199a493f1 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/core/RoleService.ts
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/const.ts
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/store.ts
#	packages/frontend/src/ui/_common_/stream-indicator.vue
#	packages/frontend/src/ui/universal.vue
 2023-10-30 18:33:03 +09:00
syuilo 6a8375b045 Merge branch 'develop' into pr/12085 2023-10-30 16:24:24 +09:00
syuilo 52dbab56a4 tweak MkPullToRefresh 2023-10-30 15:16:59 +09:00
_ c239058624
feat(frontend): スワイプやボタンでタイムラインを再読込する機能 (#12113) 
* pc reloading

* add: disable TL websocket option

* fix: stream disconnect when reload

* add: pull to refresh

* fix: pull to refresh

* add changelog

* fact: change to disableStreamingTimeline

* lint

* remove: en-US text

* refactor

* refactor

* add license identifier

* tweak

* Update MkPullToRefresh.vue

* Update MkPullToRefresh.vue

* change name timeoutHeartBeat

* tweak

* 🎨

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-30 09:12:20 +09:00
mattyatea b3084f45b4 Merge remote-tracking branch 'misskey-original/develop' into develop 2023-10-29 18:11:02 +09:00
mattyatea 2c72b21977
fix: lint 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-29 16:52:39 +09:00
mattyatea 577aa85919
Merge remote-tracking branch 'mi-dev/develop' into emoji 
# Conflicts:
#	CHANGELOG.md
 2023-10-29 16:28:56 +09:00
syuilo 7436e0da18 lint fixes 2023-10-29 16:09:20 +09:00
かっこかり 1a8243f1ca
MkCodeのパースエンジンをShikiに変更 (#12102) 
* (swap) prism -> shiki

* fix styles

* (bump) aiscript-vscode to v0.0.5

* refactor

* replace prism-editor (beta)

* Update scratchpad.vue

* (enhance) MkCodeEditor自動インデント改行

* (fix) lint

* (add) scratchpad: MkStickyContainer

* Update CHANGELOG.md

* clean up

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-29 14:12:40 +09:00
mattyatea 6ad6ab03c6
update MkCustomEmojiEditLocal.vue 
update MkCustomEmojiEditRemote.vue

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-28 16:59:43 +09:00
mattyatea 1a6f0026e6
Merge remote-tracking branch 'mi-dev/develop' into emoji 
# Conflicts:
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
 2023-10-28 16:49:06 +09:00
mattyatea d94747b1c0
updare locales 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-28 16:13:16 +09:00
mattyatea 7e155917e7 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
 2023-10-28 16:06:07 +09:00
mattyatea 154dd54887 fix 2023-10-28 15:59:10 +09:00
taichan e73e21851e
feat(frontend): プラグインを用いて疑似的にミュートできるようにする (#12135) 
* feat: mute note using plugin

* Update CHANGELOG

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-28 15:50:46 +09:00
かっこかり 481db8aba4
fix(frontend): MFMパース時に意図せずnyaizeされる問題を修正 (#12161) 
* Update MkMisskeyFlavoredMarkdown.ts

* Update MkMisskeyFlavoredMarkdown.ts

* Update MkMisskeyFlavoredMarkdown.ts

* Update MkNote.vue

* (fix) にゃいずをノートでのみ適用

* fix

* Fix lint
 2023-10-28 12:41:17 +09:00
かっこかり abe78a277a
enhance(frontend): データセーバー有効時はGIFアバターを停止 (#12165) 
* (enhance) データセーバーモード有効時はGIFアバターを停止

* Update Changelog

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-28 08:00:00 +09:00
かっこかり aa31b6c65b
fix(frontend): MkGoogleのクエリを正しくエンコードできるように修正 (#12164) 
* (fix)MkGoogleで一部キーワードのURLエンコードに失敗する

* Update Changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-28 07:57:10 +09:00
mattyatea edc475d232 fix 2023-10-28 06:17:09 +09:00
mattyatea 85c9b35d03 fix 2023-10-26 17:23:49 +09:00
Lya 1d9b5ae1ba
chore(frontend): 絵文字名のフィールドでautocapitalizeしないように (#12139) 2023-10-25 21:20:36 +09:00
mattyatea ff2df67c57 ref: gaming mode 2023-10-24 21:13:30 +09:00
mattyatea cd00655ae4
draftを抹消 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-24 17:04:18 +09:00
mattyatea 8fd5eb7010
draftからrequestに 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-24 16:55:22 +09:00
mattyatea 53d250dddf
draft-update から update-draft に 
admin/emoji/list-draft を追加

Update MkPagination.vue

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-24 15:37:43 +09:00
mattyatea b511ab2199
Merge remote-tracking branch 'mi-dev/develop' into emoji 
# Conflicts:
#	CHANGELOG.md
#	packages/misskey-js/etc/misskey-js.api.md
 2023-10-22 21:06:59 +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 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 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
mattyatea 27a7d0bbf7
Merge remote-tracking branch 'mi-dev/develop' into emoji 
# Conflicts:
#	packages/backend/src/models/RepositoryModule.ts
#	packages/misskey-js/etc/misskey-js.api.md
 2023-10-21 19:56:27 +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
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
mattyatea fe938bf8e6
Feat: 絵文字申請中のやつのテーブルを分けた 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-10-21 16:29:53 +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
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
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
syuilo 274c21e2cc chore(backend): tweak MkInput 2023-10-08 17:57:48 +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 38b9bc3a4d Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/users/notes.ts
 2023-10-08 15:44:52 +09:00
syuilo 774bf6a55e enhance(frontend): make default volume of video 30% 2023-10-08 14:01:40 +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 4357c75a44 ミュート周り 2023-10-07 09:50:02 +09:00
mattyatea 8fb73c63d3 2023.10.0-beta.5-prismisskey.2 2023-10-07 09:40:58 +09:00
mattyatea c3ced9b75f Revert "revert: note editing" 
This reverts commit b4032988
 2023-10-07 07:42:27 +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 449c87262b console.log消しわさ売れ 2023-10-06 08:17:19 +09:00
mattyatea ef3dac4b1e Merge branch 'drive' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/frontend/src/components/MkDrive.folder.vue
#	packages/frontend/src/components/MkDrive.navFolder.vue
#	packages/frontend/src/components/MkDrive.vue
 2023-10-06 08:09:04 +09:00
mattyatea 12d56d69bb test 2023-10-06 08:08:01 +09:00
mattyatea c345383374 ドライブで複数選択できるようにした 2023-10-06 08:01:42 +09:00
anatawa12 ee483f2dee
Disallow renote of direct note (#11970) 
* chore: renoteに関するチェックをまとめる

* fix: ダイレクト投稿をrenoteできる

* fix(frontend): 自分のダイレクト投稿をrenoteできる

* docs(changelog): ダイレクト投稿をリノートできてしまう

* fix lint

* chore(backend): visibilityに関するエラーをApi Errorとして返す
 2023-10-05 17:03:50 +09:00
syuilo b40329887f revert: note editing 2023-10-04 12:05:01 +09:00
mattyatea a0927c5353 ドライブ複数選択できるようになった可能性がある 2023-10-04 01:00:59 +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 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
mattyatea afc6b5b655 いいかんじ 2023-09-29 13:33:22 +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 9f1a497206 いいかんじ 2023-09-28 16:48:02 +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
taichan 63c6a9bb80
Feat: register_post_form_actionでcwを変更可能にする (#11911) 
* 投稿フォームのアクション追加するプラグインでCWを変更可能にする

* Update CHANGELOG
 2023-09-28 15:35:00 +09:00
syuilo eb740e2c72 enhance: タイムラインからRenoteを除外するオプションを追加 2023-09-28 11:41:41 +09:00
syuilo d854942a1f .js 2023-09-28 11:04:14 +09:00
mattyatea 2b72034847 mfmのやつ 2023-09-27 16:40:32 +09:00
Tassoman 9d0c077311
fix: leverage join misskey multilingual behaviour (#11908) 
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2023-09-27 13:48:21 +09:00
mattyatea 39b66a2638 色がおかしいのを修正 2023-09-26 10:56:03 +09:00
mattyatea dd7b6f92df 公開範囲に色付け(localonly) 2023-09-26 10:54:46 +09:00
mattyatea bc12bba97d 絵文字の追加周り 2023-09-26 10:54:01 +09:00
mattyatea b8c4c09e59 公開範囲、見やすく。 2023-09-25 21:12:22 +09:00
mattyatea 6fef96e657 絵文字、見やすく。 2023-09-25 18:10:01 +09:00
mattyatea 9fe170a488 gaming lighting speed change 2023-09-25 02:02:33 +09:00
mattyatea 0071cb09a9 2023.9.0-prismisskey.1 2023-09-24 18:49:11 +09:00
mattyatea ee54a5ab2a 2023.9.0-prismisskey.1 2023-09-24 18:44:08 +09:00
mattyatea 2fa2242255 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-24 16:41:37 +09:00
mattyatea 4b64870ee8 fix 2023-09-24 16:39:47 +09:00
syuilo d05563c448 tweak ui 2023-09-24 11:21:03 +09:00
mattyatea 4e9aa25394 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-24 11:15:32 +09:00
syuilo 72075314a8 🎨 2023-09-24 11:08:51 +09:00
syuilo eb7c65ccb3 fix(frontend): アクセストークン発行の画面の権限が表示されない 
Fix #11880
 2023-09-24 11:04:08 +09:00
taichan ed53b5f9bc
fix: ノート通知で絵文字が使われている名前が絵文字で表示されない #11877 (#11878) 2023-09-24 07:54:58 +09:00
mattyatea 6c699f14bc fix 2023-09-24 00:33:52 +09:00
mattyatea d56d84c664 Merge remote-tracking branch 'misskey-dev/develop' into rainbow 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/endpoints/admin/emoji/add.ts
#	packages/frontend/src/components/MkMenu.vue
 2023-09-23 21:00:15 +09:00
syuilo 76c4fedb7f fix(frontend): 子メニューの表示位置がおかしい 2023-09-23 20:35:05 +09:00
syuilo c3ccec723f .js 2023-09-23 20:34:45 +09:00
mattyatea 473355a5d9 fix 2023-09-23 19:10:51 +09:00
mattyatea 6e4b8d88fd bugfix 2023-09-23 17:15:53 +09:00
mattyatea aec6bccbdf Merge remote-tracking branch 'misskey-dev/develop' into rainbow 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkMenu.vue
 2023-09-23 15:48:34 +09:00
syuilo d8a023063d fix behavior of MkMenu.vue 2023-09-23 12:43:32 +09:00
syuilo 063d24ad4f 🎨 2023-09-23 12:24:33 +09:00
syuilo ad8ddbf12f 🎨 2023-09-23 09:59:50 +09:00
mattyatea 4e846b29b9 bugfix 2023-09-23 09:58:48 +09:00
mattyatea db7e4138d7 2023.9.0-beta.11-prismisskey.4 2023-09-23 09:45:10 +09:00
mattyatea df4d040f1e 2023.9.0-beta.11-prismisskey.3 2023-09-23 09:31:01 +09:00
mattyatea 13de104634 feat: ゲーミングモード 2023-09-23 09:01:20 +09:00
syuilo 3085739e0e 🎨 
Resolve #11867
 2023-09-22 21:10:54 +09:00
syuilo d2ae80dd21 fix(frontend): リアクション一覧が種別ごとにフィルタできない 
Fix #11865
 2023-09-22 21:09:14 +09:00
mattyatea 093540375d fix: icon 2023-09-22 20:07:39 +09:00
mattyatea a63bef2d8f Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
#	packages/frontend/src/pages/settings/general.vue
 2023-09-22 20:03:34 +09:00
かっこかり 7dc9fe4e24
feat(frontend): センシティブなメディアを目立たせる設定を追加 (#11851) 
* (add) highlight sensitive image

* Update Changelog

* (change) 設定の位置

* (add) apply mediaHighlight to video

* (change) image -> media

* Update CHANGELOG

* やっぱもうちょっと太い方がいい

* (fix) style

* Update ja-JP.yml

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-09-22 16:03:10 +09:00
syuilo c836157edb
enhance: 二要素認証設定時のセキュリティを強化 (#11863) 
* enhance: 二要素認証設定時のセキュリティを強化

パスワード入力が必要な操作を行う際、二要素認証が有効であれば確認コードの入力も必要にする

* Update CoreModule.ts

* Update 2fa.ts

* wip

* wip

* Update 2fa.ts

* tweak
 2023-09-22 14:12:33 +09:00
mattyatea 6e0b64bebe Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-21 19:08:33 +09:00
mattyatea abb192e61f feat: ゲーミングモード 2023-09-21 19:05:31 +09:00
syuilo e3f151e230 feat: 指定したユーザーの投稿通知 
Resolve #11499
 2023-09-21 18:48:15 +09:00
まっちゃとーにゅ 1516de1fee feat: メディアタイムラインを輸入 (#103) 
* メディアタイムラインの実装

* refactor(stream): ストリーミングにwithFilesオプションを実装

---------

Co-authored-by: tar_bin <tar.bin.master@gmail.com>
 2023-09-21 16:39:56 +09:00
mattyatea bbd5282dc6 feat: ゲーミングモード実装 2023-09-21 16:39:18 +09:00
syuilo 1250309a69 🎨 2023-09-21 10:29:40 +09:00
mattyatea d9db4449b4 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	CHANGELOG.md
#	package.json
#	packages/frontend/src/components/MkInstanceTicker.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/settings/theme.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/ui/_common_/navbar-for-mobile.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/universal.vue
#	packages/frontend/src/widgets/WidgetInstanceInfo.vue
 2023-09-21 00:20:12 +09:00
syuilo 8e2d47b2e8 refactor 2023-09-20 16:44:12 +09:00
syuilo b0f6c44f36 refactor(frontend): use ESM 2023-09-19 16:37:43 +09:00
mattyatea 62b70f85f0 なんかもう色々変えた 2023-09-18 21:47:39 +09:00
syuilo 25ae4bca9c tab 2023-09-18 13:25:49 +09:00
syuilo 350ebbadba fix(frontend): prevent layout-shift of reactions viewer 
Fix #11842
 2023-09-18 11:42:26 +09:00
mattyatea c9b97d5e0d feat: データセーバー強化 2023-09-18 09:26:25 +09:00
mattyatea f2ab7a5626 feat: データセーバー強化 2023-09-18 09:11:20 +09:00
mattyatea 368afeba34 feat: データセーバー強化(したかった) 2023-09-18 08:24:40 +09:00
Fairy-Phy 61dad2ce35 emojiKitchenベースのmix関数を追加 2023-09-17 18:24:19 +09:00
mattyatea 5698b115bb Merge remote-tracking branch 'misskey-dev/develop' into develop 
# Conflicts:
#	package.json
 2023-09-17 17:50:19 +09:00