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

91 commits

Author SHA1 Message Date
mattyatea 1c108927ea 色々リファ 2024-01-03 01:25:32 +09:00
mattyatea 1456d49042 bug fix 2023-12-30 08:53:47 +09:00
mattyatea d19a4ab8a3 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/stream/ChannelsService.ts
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/mute-block.vue
 2023-12-28 04:42:28 +09:00
YAVIIGI 47558a6648
feat(frontend): 投稿ウインドウにMFM要素を追加するボタンの追加 (#12788) 
* functionPicker の追加

* Update CHANGELOG.md

* fix lint errors

* Add addMfmFunction

* add enableQuickAddMfmFunction setting

* Update CHANGELOG.md

issue 番号を追加

* Update index.d.ts

* change 'functionPicker' to 'mfmFunctionPicker'

* Change indent from 4 space to 1 tab

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-12-27 20:57:43 +09:00
mattyatea 487b3089a0 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	README.md
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteSimple.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/widgets/WidgetInstanceInfo.vue
 2023-12-23 09:14:17 +09:00
syuilo 742da2f1e9 feat(frontend): 画面に雪を降らせる機能を復活 2023-12-16 13:52:52 +09:00
mattyatea 8c4a08c383 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/channels/timeline.ts
#	packages/backend/src/server/api/endpoints/notes/featured.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkClickerGame.vue
#	packages/frontend/src/components/MkDialog.vue
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkInstanceTicker.vue
#	packages/frontend/src/components/MkLaunchPad.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteSimple.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkRadio.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkSwitch.vue
#	packages/frontend/src/custom-emojis.ts
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/admin/other-settings.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/pages/user/index.files.vue
#	packages/frontend/src/scripts/get-note-menu.ts
#	packages/frontend/src/store.ts
#	packages/frontend/src/ui/_common_/stream-indicator.vue
#	packages/frontend/src/ui/classic.sidebar.vue
#	packages/frontend/src/ui/universal.vue
#	packages/frontend/src/ui/universal.widgets.vue
#	packages/frontend/vite.config.ts
#	packages/misskey-js/etc/misskey-js.api.md
#	packages/misskey-js/src/api.types.ts
#	packages/misskey-js/src/entities.ts
#	packages/misskey-js/src/streaming.types.ts
 2023-12-13 07:08:57 +09:00
woxtu 4c135a5ca1
Fix indentation (#12615) 2023-12-10 02:11:17 +09:00
mattyatea da83bc315a feat: 絵文字のホーム通知 2023-12-09 19:05:27 +09:00
おさむのひと b0039f0946
chore: 開発モードでフロントエンドとバックエンドを独立して起動するようにする（再） (#12593) 
* [wip]run standalone vite

* [wip]run standalone vite

* some fix (tabler icons, sw, streaming)

* fix theme

* fix run scripts

* favicon

* client-assets

* cssの読み込み順序とCSP設定の変更

* fix lang change

* fix clientManifest

* baseを相対パスにしてドメイン直下とサブディレクトリ配下両方に対応

* 色々修正

* 色々修正

* 色々修正

* fix

* Revert "client-assets"

This reverts commit 582601e90e.

# Conflicts:
#	packages/frontend/vite.config.ts

* 色々修正

* fix

* fix

* add url and proxy to server proxy

* Update packages/frontend/src/index.html

* wip

* Merge remote-tracking branch 'origin/develop' into feat/launch-standalone-frontend

# Conflicts:
#	packages/frontend/src/pages/welcome.entrance.a.vue

* Merge remote-tracking branch 'origin/develop' into feat/launch-standalone-frontend

# Conflicts:
#	packages/frontend/src/pages/welcome.entrance.a.vue

* fix tabler load

* Apply suggestions from code review

* Update packages/frontend/src/index.html

* fix

* fix vite.config.local-dev.ts

* fix CONTRIBUTING.md

---------

Co-authored-by: FruitRiin <nassii74@gmail.com>
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: 果物リン <fruitriin@riinswork.space>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: ozelot <contact@ozelot.dev>
 2023-12-08 08:22:08 +09:00
zyoshoka 406b4bdbe7
refactor(frontend): 非推奨となったReactivity Transformを使わないように (#12539) 
* refactor(frontend): 非推奨となったReactivity Transformを使わないように

* refactor: 不要な括弧を除去

* fix: 不要なアノテーションを除去

* fix: Refの配列をrefしている部分の対応

* refactor: 不要な括弧を除去

* fix: lint

* refactor: Ref、ShallowRef、ComputedRefの変数の宣言をletからconstに置換

* fix: type error

* chore: drop reactivity transform from eslint configuration

* refactor: remove unnecessary import

* fix: 対応漏れ
 2023-12-07 14:42:09 +09:00
かっこかり 5bf7813b2d
enhance/feat(frontend): データセーバーの改良・強化 (#12526) 
* enhance(frontend): データセーバーを個別で設定できるように

* Update Changelog

* fix design

* (fix) 設定が当たらない

* fix test（無理やり感）

* (fix) 設定がない状態ですべて有効・向操作が効かない

* fix

* tweak

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-12-03 10:58:42 +09:00
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
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 ca1cda0db0 enhance(frontend): tweak settings page 2023-11-04 16:44:14 +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 c2208fb1c5 インジケーターとか 2023-11-02 14:32:07 +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
mattyatea 7242b195ab fix 2023-10-28 06:06:41 +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 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 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
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
mattyatea bbf1ba6a54 Fix: mute 2023-10-20 14:39:25 +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 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
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
mattyatea 40469aa0ce 逆張りモードの実装 2023-10-12 18:02:55 +09:00
mattyatea abb79a0b36 ユーザーのページでノートを表示するかハイライトを表示するか決められるようにした 2023-10-07 10:40:08 +09:00
mattyatea ac1367a0b9 TLの絞り込み保存できるようにした 2023-09-30 19:02:17 +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
syuilo eb740e2c72 enhance: タイムラインからRenoteを除外するオプションを追加 2023-09-28 11:41:41 +09:00
mattyatea dd7b6f92df 公開範囲に色付け(localonly) 2023-09-26 10:54:46 +09:00
mattyatea b8c4c09e59 公開範囲、見やすく。 2023-09-25 21:12:22 +09:00
mattyatea 1a9d3737b1 ゲーミングのスピードの調整 2023-09-25 02:57:48 +09:00
mattyatea 9fe170a488 gaming lighting speed change 2023-09-25 02:02:33 +09:00
mattyatea df4d040f1e 2023.9.0-beta.11-prismisskey.3 2023-09-23 09:31:01 +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
mattyatea f05f911916 feat: メディアタイムライン実装 2023-09-21 17:31:23 +09:00