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
c1514ce91d
(re) update SPDX-FileCopyrightText
...
Fix #13290
2024-02-13 15:59:27 +00:00
311c2172d7
Revert "update SPDX-FileCopyrightText"
...
This reverts commit 9b5aeb76d8
2024-02-13 15:50:11 +00:00
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
9b5aeb76d8
update SPDX-FileCopyrightText
2024-02-12 11:37:45 +09:00
e4fe534dc6
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/activitypub/models/ApPersonService.ts
2024-02-05 13:55:26 +09:00
2c4ba4723f
fix(backend): メール配信機能が無効ならばメールを送ることのないように ( #13152 )
...
Do not send email if email delivery is disabled
2024-02-04 20:44:35 +09:00
f6d3fde92d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkUserSelectDialog.vue
# packages/frontend/src/components/index.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/avatar-decorations.vue
# packages/frontend/src/pages/settings/mute-block.word-mute.vue
# packages/frontend/src/pages/user/home.vue
# packages/misskey-bubble-game/src/monos.ts
2024-01-20 14:54:06 +09:00
b17eb8e537
fix: Some fixes for #12850 ( #12862 )
...
- refinement the error message when trueMail validation fails
- the settings of trueMail are not displayed after saving
- changing how `Active Email Validation` is saved
2024-01-19 18:48:30 +09:00
8cb7ba0c16
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkPostForm.vue
2023-12-30 09:11:09 +09:00
7948018e6a
feat: Add support for TrueMail ( #12850 )
...
Co-authored-by: MarryDream <2190758465@qq.com>
2023-12-29 18:23:29 +09:00
8d058b0529
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/settings/theme.vue
# packages/frontend/src/ui/_common_/navbar-for-mobile.vue
2023-12-26 23:38:43 +09:00
cae40e68e4
fix: lint ( #12761 )
2023-12-24 15:24:51 +09:00
09fbfee252
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/EmailService.ts
# packages/frontend/src/components/MkSignupDialog.form.vue
2023-12-23 23:16:48 +09:00
6e4894c165
lint
2023-12-23 14:39:01 +09:00
5b5a537f56
feat: 登録を拒否するメールアドレスのドメインを手動で設定できるように ( #12740 )
...
* feat: 使い捨てアドレスのドメインを手動で設定できるように
* Update CHANGELOG.md
* disposableEmailDomains -> bannedEmailDomains
* isBlockedHostを使うように
2023-12-23 12:06:22 +09:00
b3c4f7eddc
fix: email verify enable logic ( #12743 )
2023-12-23 11:00:14 +09:00
eb88ac308e
捨てめあど弾く
2023-12-10 01:39:13 +09:00
e4b090b20b
捨てめあど弾く
2023-12-10 01:32:00 +09:00
30dc6e691d
lint fix
2023-11-18 21:04:00 +09:00
0a73973a7c
メールアドレスの認証にverifymail.ioを使えるようにする。
2023-11-18 21:01:53 +09:00
6cf466e5d1
update deps ( #11820 )
...
* update deps
* fix
* wip
* wip
* wip
* Update docker-compose.yml.example
* Delete reviewer-lottery.yml
* Update RepositoryModule.ts
* wip
* wip
* clean up
* update deps
* wip
* wip
2023-09-15 14:28:29 +09:00
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
d84796588c
cleanup: trim trailing whitespace ( #11136 )
...
* cleanup: trim trailing whitespace
* update(`.editorconfig`)
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-07-08 07:08:16 +09:00
bbb49457f9
refactor: introduce bindThis decorator to bind this automaticaly
2022-12-04 15:03:09 +09:00
89ef21e3b0
fix type
2022-09-24 16:53:53 +09:00
01d4d55e78
fix import type
2022-09-21 05:33:11 +09:00
a2eac9fff6
test
2022-09-19 03:11:50 +09:00
dd35f2cce6
refactor(backend): refactor logger
2022-09-18 23:07:41 +09:00
b75184ec8e
なんかもうめっちゃ変えた
2022-09-18 03:27:08 +09:00
mattyatea
おさむのひと
tamaina
syuilo
atsuchan
AsukaMari
MomentQYC
mattyatea
Nya Candy
GrapeApple0
Nafu Satsuki
Shun Sakai
okayurisotto