203b824b28
emoji more
2024-06-20 13:49:08 +09:00
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
e86e8f6aa6
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
...
# Conflicts:
# README.md
# packages/backend/src/core/entities/AbuseUserReportEntityService.ts
# packages/frontend/src/pages/admin/moderation.vue
2024-05-31 21:18:45 +09:00
97be1a53ad
Update 1717117195275-inquiryUrl.js
2024-05-31 14:59:02 +09:00
be11fd7508
enhance: サーバーのお問い合わせ先URLを設定できるように
2024-05-31 10:12:23 +09:00
653f5cfbc2
update
2024-05-29 01:22:30 +09:00
07b4338eff
Merge remote-tracking branch 'refs/remotes/misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/cache.ts
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
2024-05-29 01:21:44 +09:00
4579be0f54
新着ノートをサウンドで通知する機能をdeck UIに追加 ( #13867 )
...
* feat(deck-ui): implement note notification
* chore: remove notify in antenna
* docs(changelog): 新着ノートをサウンドで通知する機能をdeck UIに追加
* fix: type error in test
* lint: key order
* fix: remove notify column
* test: remove test for notify
* chore: make sound selectable
* fix: add license header
* fix: add license header again
* Unnecessary await
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
* ファイルを選択してください -> ファイルが選択されていません
* fix: i18n忘れ
* fix: i18n忘れ
* pleaseSelectFile > fileNotSelected
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2024-05-27 20:54:53 +09:00
6445591350
Merge remote-tracking branch 'refs/remotes/github-prismisskey/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# packages/frontend/src/components/MkPostForm.vue
# pnpm-lock.yaml
2024-05-25 01:18:55 +09:00
83a9aa4533
feat: suspend instance improvements ( #13861 )
...
* feat(backend): dead instance detection
* feat(backend): suspend type detection
* feat(frontend): show suspend reason on frontend
* feat(backend): resume federation automatically if the server is automatically suspended
* docs(changelog): 配信停止まわりの改善
* lint: fix lint errors
* Update packages/frontend/src/pages/instance-info.vue
* lint: fix lint error
* chore: suspendedState => suspensionState
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-05-23 15:55:47 +09:00
f6df94070b
Exclude channel notes from featured polls ( #13838 )
...
* feat(backend): add `channelId` to `MiPoll` as a Denormalized field
* feat(backend): option to exclude polls in channels
* chore: exclude channel notes from featured polls
* docs(changelog): みつけるのアンケート欄にてチャンネルのアンケートが含まれてしまう問題を修正
* fix: missing license header
2024-05-20 18:08:20 +09:00
fb6154957f
update
2024-05-17 12:18:30 +09:00
4da6ae53e9
update
2024-05-17 12:16:43 +09:00
4a0138297e
update
2024-05-16 01:50:40 +09:00
6a07fa78dd
update
2024-05-16 01:08:17 +09:00
9f60e186b0
update
2024-05-06 07:41:47 +09:00
024ce3c881
update
2024-05-04 23:32:43 +09:00
04fae906c9
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/models/Meta.ts
# packages/backend/src/server/api/endpoints/admin/meta.ts
# packages/backend/src/server/api/endpoints/admin/update-meta.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteDetailed.vue
# packages/frontend/src/components/MkSwitch.button.vue
# packages/frontend/src/pages/settings/general.vue
2024-04-01 15:32:52 +09:00
831c74a25b
fix: URLプレビューの動作改善＋動作設定を可能にする ( #13579 )
...
* wip
* support new version
* URLプレビュー無効化時、フロント側も非表示にしてリクエストをしないようにする
* fix lint
* fix lint
* tweak preview request error handles
* fix: CHANGELOG.md
* fix
* fix
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-03-21 18:46:42 +09:00
f4838e50b4
enhance(antenna): Botの投稿を除外できるように ( #13603 )
...
* enhance(antenna): Botの投稿を除外できるように (MisskeyIO#545)
(cherry picked from commit a95ce067c6
2024-03-21 07:51:01 +09:00
d2a02da432
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-03-18 15:10:24 +09:00
29f6ba6310
chore: add missing SPDX ID and workflow check ( #13570 )
...
* chore: add workflow which checks if SPDX ID exists
* chore: add missing SPDX ID in some files
* chore: change trigger condition
* chore: trigger on push
* lint
2024-03-13 22:37:18 +09:00
1947a53af6
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# README.md
# locales/en-US.yml
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/core/NoteCreateService.ts
# packages/backend/src/core/RoleService.ts
# packages/backend/src/core/activitypub/models/ApNoteService.ts
# packages/backend/src/core/activitypub/models/ApPersonService.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/global/MkCustomEmoji.vue
# packages/frontend/src/const.ts
# packages/frontend/src/os.ts
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/admin/roles.vue
# packages/frontend/src/pages/admin/security.vue
# pnpm-lock.yaml
2024-03-05 16:38:19 +09:00
26c8b53f70
enhance: サーバーごとにモデレーションノートを残せるように
2024-02-22 20:59:52 +09:00
cc69717f0d
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkAbuseReport.vue
2024-02-19 22:05:40 +09:00
1b1046bcdb
fix: syuilo/misskey時代から使用してるサーバーが改変したバージョンだと誤判定される問題 (DB migrationで修正) ( #13389 )
2024-02-19 08:34:31 +09:00
69c16f036c
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/frontend/src/pages/about.vue
# packages/frontend/src/scripts/get-note-menu.ts
2024-02-17 13:45:01 +09:00
acba96c1d3
feat: license violation protection ( #13285 )
...
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる
Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438
* feat: license violation protection
* build: fix typo
* build: fix typo
* fix: farewell to the static type land
* fix: key typo
* fix: import typo
* fix: properly interpret `prominently`
* docs: add disclaimer
* docs: update CHANGELOG
* chore: add gap
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-17 13:34:50 +09:00
408acfdb5a
a
2024-02-16 20:36:47 +09:00
332a3f2737
a
2024-02-16 19:46:53 +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
23508dc56e
fix
2024-02-13 13:29:10 +09:00
e1eee2872d
ノートの編集履歴を見れるように(新規ノートのみ)
...
(cherry picked from commit 25763ee679
2024-02-13 13:08:20 +09:00
e9fda7dd1a
feat(backend): Federated note update ( #1 )
...
(cherry picked from commit 6af23d4e28893b0ab253182153973bcad1210ac0)
2024-02-13 12:45:49 +09: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
dfd491ff85
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkTimeline.vue
# packages/frontend/src/pages/settings/theme.vue
2024-02-09 10:14:24 +09:00
614c9a0fc6
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 ( #13210 )
...
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加
* Serviceでチェックするように変更
2024-02-09 10:07:18 +09:00
7579df2da0
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/frontend/src/components/MkFoldableSection.vue
# packages/frontend/src/components/MkPostForm.vue
2024-02-03 21:13:22 +09:00
85809a240e
fix(backend): "誰でも新規登録できるようにする"の初期値をOFFにする ( #13130 )
...
* fix(backend): "誰でも新規登録できるようにする"の初期値をOFFにする
* fix CHANGELOG.md
* fix
2024-02-02 11:24:45 +09:00
7a3eb26c4d
Merge remote-tracking branch 'misskey-mattyatea/report' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# packages/backend/src/models/Meta.ts
# packages/backend/src/server/api/endpoints/admin/meta.ts
# packages/backend/src/server/api/endpoints/admin/update-meta.ts
2024-01-28 08:01:21 +09:00
79d2b6fe9e
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
2024-01-24 16:40:37 +09:00
5719a929ad
enhance(reversi): 変則なしマッチングを可能に
2024-01-24 16:37:06 +09:00
6390977653
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-01-21 13:44:29 +09:00
a17251d913
enhance(reversi): tweak reversi
2024-01-21 10:07:43 +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
a637b4e282
feat: reversi
...
Resolve #12962
2024-01-19 20:51:49 +09:00
8205e30311
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/core/QueryService.ts
# packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
# packages/backend/src/server/api/endpoints/hashtags/users.ts
# packages/backend/src/server/api/endpoints/notes/create.ts
# packages/frontend/src/pages/emojis.emoji.vue
2024-01-15 23:20:00 +09:00
mattyatea
おさむのひと
syuilo
anatawa12
かっこかり
zyoshoka
Acid Chicken (硫酸鶏)
tamaina
NoriDev
GrapeApple0
Caipira
syuilo