Commit Graph

1439 Commits

Author SHA1 Message Date
mattyatea 309812a11c Merge remote-tracking branch 'misskey-dev/develop' into prismisskey 2023-09-30 19:07:22 +09:00
あすぱる 6840434661
change request.routerPath to requrest.routeOptions.url (#11935) 2023-09-30 14:44:16 +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 d0917aac1a fix test 2023-09-30 08:56:37 +09:00
syuilo 7e74cff126 後方互換性の強化 2023-09-30 08:12:25 +09:00
syuilo 392de4df36 enhance: ノートの翻訳機能の利用可否をロールで設定可能に
Resolve #11923
2023-09-30 07:54:11 +09:00
syuilo a512915a84 fix(backend): Redisに古いMisskeyバージョンのキャッシュが残っている場合の問題を修正 2023-09-30 07:33:58 +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 d92e2b6ae0 Update create.test.ts 2023-09-29 16:41:03 +09:00
syuilo 961f5a0caa fix(backend): fix notes/create validation 2023-09-29 15:14:13 +09:00
syuilo ac19b055c7 update deps 2023-09-29 15:11:08 +09:00
syuilo 2529830bca tweak 2023-09-29 13:42:18 +09:00
syuilo c01731f091 refactor 2023-09-29 13:41:09 +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
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 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 772d2432b6 enhance: タイムラインからRenoteを除外するオプションを追加 2023-09-28 15:32:47 +09:00
syuilo eb740e2c72 enhance: タイムラインからRenoteを除外するオプションを追加 2023-09-28 11:41:41 +09:00
syuilo ce1218a2b2 enhance: ユーザーページのノート一覧でRenoteを除外できるように 2023-09-28 11:02:01 +09:00
syuilo 055464a624 enhance: improve moderation log 2023-09-28 10:02:05 +09:00
CyberRex 5ad0906c89
feat(backend): MasterプロセスのPIDを書き出せるように (#11909) 2023-09-27 09:32:36 +09:00
mattyatea bc12bba97d 絵文字の追加周り 2023-09-26 10:54:01 +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 576158e883 fix(backend): 「ユーザーの新規投稿」の通知設定を切り替えるとサーバー内部エラーが出る
Fix #11892
2023-09-25 10:34:07 +09:00
syuilo 5318532a8d enhance: improve moderation log 2023-09-25 10:29:12 +09:00
mattyatea da147417e9 fix emoji 2023-09-24 21:12:25 +09:00
taichan dc8ab01168
fix(backend): お知らせのページネーションが機能しない #11800 (#11890)
* fix(backend): お知らせのページネーションが機能しない #11800

* Update CHANGELOG
2023-09-24 20:08:00 +09:00
mattyatea 969b16d9c2 Merge remote-tracking branch 'misskey-dev/develop' into prismisskey
# Conflicts:
#	package.json
2023-09-24 18:15:21 +09:00
syuilo fe570fe16b
Update DriveService.ts 2023-09-24 16:45:36 +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 cf573add27 fix 2023-09-24 16:24:13 +09:00
syuilo 00659220a5 Update update.ts 2023-09-24 15:51:04 +09:00
syuilo 51546ad1ce fix(backend): Playを非公開にできない
Fix #11884
2023-09-24 15:46:14 +09:00
syuilo 841e6ff901 improve moderation log 2023-09-24 15:40:38 +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 509cea511c update deps 2023-09-24 11:09:49 +09:00
syuilo 8e5a90589d improve moderation log 2023-09-24 10:57:24 +09:00
syuilo ed983a5baf improve moderation log 2023-09-24 10:46:09 +09:00
syuilo 2ad3b1fd74 improve moderation log 2023-09-24 10:33:30 +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 19bc9c20a6 improve moderation log 2023-09-23 20:50:02 +09:00
syuilo 10924fd229 fix 2023-09-23 18:47:11 +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
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