mattyatea
71382a6f85
Merge remote-tracking branch 'mattyateaFork/develop' into develop
...
# Conflicts:
# CHANGELOG.md
# README.md
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/activitypub/models/ApNoteService.ts
# packages/backend/src/server/api/endpoints/admin/avatar-decorations/list.ts
# packages/backend/src/server/api/endpoints/get-avatar-decorations.ts
# packages/backend/test/unit/entities/UserEntityService.ts
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/emoji-edit-dialog.vue
# packages/frontend/src/ui/universal.vue
2024-07-15 14:59:54 +09:00
mattyatea
4e5f16cdf9
Type4ny Project Initialize
2024-07-01 09:33:26 +09:00
mattyatea
833031ee60
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/QueueModule.ts
# packages/backend/src/core/QueueService.ts
# packages/backend/src/core/chart/charts/federation.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/backend/src/queue/types.ts
# packages/backend/src/server/api/EndpointsModule.ts
# packages/backend/src/server/api/endpoints.ts
# packages/backend/src/server/api/endpoints/admin/queue/stats.ts
# packages/backend/src/server/api/endpoints/users/report-abuse.ts
# packages/backend/src/server/web/ClientServerService.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkChannelFollowButton.vue
# packages/frontend/src/components/MkClickerGame.vue
# packages/frontend/src/components/MkSwitch.vue
2024-06-12 14:14:45 +09:00
おさむのひと
61fae45390
feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする ( #13758 )
...
* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする
* モデログに対応＆エンドポイントを単一オブジェクトでのサポートに変更（API経由で大量に作るシチュエーションもないと思うので）
* fix spdx
* fix migration
* fix migration
* fix models
* add e2e webhook
* tweak
* fix modlog
* fix bugs
* add tests and fix bugs
* add tests and fix bugs
* add tests
* fix path
* regenerate locale
* 混入除去
* 混入除去
* add abuseReportResolved
* fix pnpm-lock.yaml
* add abuseReportResolved test
* fix bugs
* fix ui
* add tests
* fix CHANGELOG.md
* add tests
* add RoleService.getModeratorIds tests
* WebhookServiceをUserとSystemに分割
* fix CHANGELOG.md
* fix test
* insertOneを使う用に
* fix
* regenerate locales
* revert version
* separate webhook job queue
* fix
* 🎨
* Update QueueProcessorService.ts
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-06-08 15:34:19 +09:00
tamaina
c1514ce91d
(re) update SPDX-FileCopyrightText
...
Fix #13290
2024-02-13 15:59:27 +00:00
tamaina
311c2172d7
Revert "update SPDX-FileCopyrightText"
...
This reverts commit 9b5aeb76d8
2024-02-13 15:50:11 +00:00
mattyatea
5812b15cbd
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/QueueService.ts
# packages/frontend/src/components/global/MkFooterSpacer.vue
2024-02-13 05:48:07 +09:00
syuilo
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
mattyatea
e133a6b6a4
いちおう動くようにはなった
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-11-06 18:15:29 +09:00
Shun Sakai
c2370a1be6
chore: 著作権とライセンスについての情報を各ファイルに追加する ( #11348 )
...
* chore: Add the SPDX information to each file
Add copyright and licensing information as defined in version 3.0 of
the REUSE Specification.
* tweak format
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-07-27 14:31:52 +09:00
tamaina
0a06eb27da
enhance(backend): 設定ファイルでioredisの全てのオプションを指定可能に ( #11329 )
...
* enhance(backend): 設定ファイルでioredisの全てのオプションを指定可能に
* yappa kousuru
* fix
* fix?
* fix
* Revert "fix"
This reverts commit 227f19ff3a
2023-07-20 19:50:31 +09:00
syuilo
fd7b77c542
enhance(backend): migrate bull to bullmq ( #10910 )
...
* wip
* wip
* Update QueueService.ts
* wip
* refactor
* ✌️
* fix
* Update QueueStatsService.ts
* refactor
* Update ApNoteService.ts
* Update mock-resolver.ts
* refactor
* Update mock-resolver.ts
2023-05-29 11:54:49 +09:00
