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

196 commits

Author SHA1 Message Date
mattyatea cb1005811d Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/en-US.yml
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkDrive.file.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteHeader.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkReactionsViewer.reaction.vue
#	packages/frontend/src/components/MkUserSetupDialog.vue
#	packages/frontend/src/pages/timeline.tutorial.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/misskey-js/etc/misskey-js.api.md
 2023-11-04 01:24:44 +09:00
syuilo ee191169f5 enhance(frontend): tweak announcement manage ui 2023-11-03 17:14:35 +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
GrapeApple0 4f180ad45c
feat: アイコンデコレーションの管理をロールで設定できるように (#12173) 
* アイコンデコレーションの管理をロールで設定できるように

* インポートミス

* Update packages/frontend/src/ui/_common_/common.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* Update packages/frontend/src/ui/_common_/common.ts

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-10-30 15:33:15 +09:00
syuilo 50b16e36c7 enhance(frontend): URL入力フォームのtypeをurlに 
Resolve #12137
 2023-10-30 13:41:40 +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 cc5037cb85 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
#	packages/frontend/package.json
 2023-10-23 19:29:34 +09:00
syuilo e6c54de814 enhance(backend): RedisへのTLのキャッシュをオフにできるように 2023-10-23 15:17:25 +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
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 4f6b0ccf6b emoji 2023-10-19 01:16:11 +09:00
mattyatea 6cc503dfc9 fix 2023-10-18 23:14:25 +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
まっちゃてぃー 198f7748ce
Merge branch 'develop' into emoji-request 2023-10-16 21:50:42 +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
tar_bin ad27562269 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 2023-10-14 12:39:11 +09:00
tar_bin 40979b0aa5 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 2023-10-14 12:39:11 +09:00
tar_bin ffa81260ac 絵文字の登録リクエスト機能の追加 
(cherry picked from commit 702a3e86878bc7f210d90f15c4f4417d542ba086)
 2023-10-14 12:38:20 +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 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 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
syuilo 0dbf5175df enhance: improve moderation log 2023-10-04 19:55:35 +09:00
syuilo bcbcaa9c60
🎨 2023-10-04 12:56:57 +09:00
syuilo b40329887f revert: note editing 2023-10-04 12:05:01 +09:00
syuilo 17b83ff4c1 enhance: TLキャッシュ容量を設定できるように 2023-10-04 08:46:27 +09:00
mattyatea b96c76b2c5 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-30 10:24:26 +09:00
syuilo 392de4df36 enhance: ノートの翻訳機能の利用可否をロールで設定可能に 
Resolve #11923
 2023-09-30 07:54:11 +09:00
syuilo cc6a96e1c9 enhance(front)end: improve moderation log 2023-09-30 07:42:38 +09:00
mattyatea 582a6948e5 いいかんじ 2023-09-29 23:18:18 +09:00
syuilo 9771f1c435 enhance: improve moderation log 2023-09-29 13:26:11 +09:00
nenohi 9c448055a3
広告に関する修正(配信中の絞り込み、Create時にMiAdを返すように) (#11913) 
* ad/createにて作成したMiAdを返すように

別なツールからアップデート等をする際に必要

* ad/list取得に現在掲載中のオプションを作成

* スイッチで配信中のみを絞れるように

* update CHANGELOG

* エラー修正

* Update packages/frontend/src/pages/admin/ads.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-09-29 12:27:05 +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 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 440f3144ae enhance(frontend): improve moderation log 2023-09-27 10:00:26 +09:00
mattyatea a6ae84df71 Merge remote-tracking branch 'misskey-dev/master' into prismisskey 
# Conflicts:
#	package.json
 2023-09-25 21:13:56 +09:00
syuilo bd19d75c9c enhance: improve moderation log 2023-09-25 16:03:43 +09:00
syuilo 5318532a8d enhance: improve moderation log 2023-09-25 10:29:12 +09:00
mattyatea 2fa2242255 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 
# Conflicts:
#	package.json
 2023-09-24 16:41:37 +09:00
syuilo 82a51d49a0 improve moderation log 2023-09-24 15:10:56 +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 9e4d3ebe5f
enhance(backend): refine moderation log (#10939) 
* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* wip

* Update DriveService.ts
 2023-09-23 18:28:16 +09:00