Commit graph

223 commits

Author SHA1 Message Date
mattyatea 5b7984a23b Revert "Fix: mute"
This reverts commit bbf1ba6a
2023-11-26 16:54:42 +09:00
mattyatea ff79746100 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/backend/src/models/json-schema/user.ts
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkReactionsViewer.reaction.vue
#	packages/frontend/src/pages/settings/mute-block.word-mute.vue
#	packages/misskey-js/etc/misskey-js.api.md
2023-11-24 22:44:42 +09:00
Camilla Ett 30b443de55
feat(frontend): リアクションの横幅を150pxに制限するかどうかユーザーが選べるように (#12416)
* feat(frontend): リアクションの横幅を150pxに制限するかどうかユーザーが選べるように

* localesの変更をjs-JP.ymlのみに修正し、日本語をより分かりやすく

* クラス名を.icon から .limitWidthに変更
2023-11-24 08:37:27 +09:00
anatawa12 864827f788
Hard mute (#12376)
* feat(backend,misskey-js): hard mute storage in backend

* fix(backend,misskey-js): mute word record type

* chore(frontend): generalize XWordMute

* feat(frontend): configure hard mute

* feat(frontend): hard mute notes on the timelines

* lint(backend,frontend): fix lint failure

* chore(misskey-js): update api.md

* fix(backend): test failure

* chore(frontend): check word mute for reply

* chore: limit hard mute count
2023-11-23 18:56:20 +09:00
mattyatea e3d8346e21 Merge remote-tracking branch 'misskey-original/develop' into develop 2023-11-19 17:56:14 +09:00
yukineko 02b0adf31f
fix: 「設定のバックアップ」に一部の設定項目が含まれていない問題を修正 (#12366)
* fix: 一部の設定項目がバックアップに含まれていなかったのを修正

* update: CHANGELOG.md

* remove: バックアップ不要な項目を削除
2023-11-19 11:45:24 +09:00
mattyatea 9e9c76fa57 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
2023-11-17 18:33:39 +09:00
syuilo 08b3662bb8 chore(frontend): tweak ui 2023-11-17 18:00:42 +09:00
mattyatea d439dd66f9 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNotifications.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/_common_/stream-indicator.vue
2023-11-15 13:32:09 +09:00
zyoshoka cec02966ad
fix(frontend): 「フォロー中の人全員の返信を含める/含めないようにする」のボタンを押下した際の確認が機能していない問題を修正 (#12308)
* fix(frontend): 「フォロー中の人全員の返信を含める/含めないようにする」のボタンを押下した際の確認が機能していない問題を修正

* Update CHANGELOG.md
2023-11-11 16:34:46 +09:00
mattyatea da40b4df17 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNoteDetailed.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/scripts/nyaize.ts
2023-11-05 21:25:11 +09:00
syuilo 56401ed91c 🎨 2023-11-05 08:25:08 +09:00
syuilo ca1cda0db0 enhance(frontend): tweak settings page 2023-11-04 16:44:14 +09:00
mattyatea bee34b41e0 Merge remote-tracking branch 'misskey-original/develop' into develop
# Conflicts:
#	packages/frontend/src/ui/universal.vue
2023-11-04 10:15:02 +09:00
mattyatea 9d02079890 uhoize fix 2023-11-04 10:12:13 +09:00
syuilo 67414e0181 perf(frontend): soundConfigStore を defaultStore に統合しAPIリクエストを削減 2023-11-04 10:09:21 +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 801637ef1d Revert "🎨"
This reverts commit e6e5bf1da4.
2023-11-02 14:45:50 +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
かっこかり 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
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 a76a977358 fix 2023-10-30 18:44:15 +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
_ 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
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 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
かっこかり e5ff8d8445
enhance: プラグイン削除時にアクセストークンも削除する (#12167)
* (enhance) プラグイン削除時にトークンも削除

* update changelog
2023-10-28 07:54:06 +09:00
mattyatea 7242b195ab fix 2023-10-28 06:06:41 +09:00
syuilo afb37f0b03 🎨 2023-10-24 14:38:15 +09:00
mattyatea 76aad3f869 2023.11.0-beta.2-prismisskey.1 2023-10-23 05:16:08 +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 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 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 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
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
mattyatea bbf1ba6a54 Fix: mute 2023-10-20 14:39:25 +09:00
Nafu Satsuki 4d00155a42 feat: ワードミュートに該当したノートを非表示にできるように 2023-10-19 19:15:53 +09:00