mattyatea
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
syuilo
26c8b53f70
enhance: サーバーごとにモデレーションノートを残せるように
2024-02-22 20:59:52 +09:00
mattyatea
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
anatawa12
1b1046bcdb
fix: syuilo/misskey時代から使用してるサーバーが改変したバージョンだと誤判定される問題 (DB migrationで修正) ( #13389 )
2024-02-19 08:34:31 +09:00
mattyatea
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
Acid Chicken (硫酸鶏)
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
mattyatea
408acfdb5a
a
2024-02-16 20:36:47 +09:00
mattyatea
332a3f2737
a
2024-02-16 19:46:53 +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
NoriDev
23508dc56e
fix
2024-02-13 13:29:10 +09:00
GrapeApple0
e1eee2872d
ノートの編集履歴を見れるように(新規ノートのみ)
...
(cherry picked from commit 25763ee679
)
2024-02-13 13:08:20 +09:00
Caipira
e9fda7dd1a
feat(backend): Federated note update ( #1 )
...
(cherry picked from commit 6af23d4e28893b0ab253182153973bcad1210ac0)
2024-02-13 12:45:49 +09: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
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
mattyatea
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
mattyatea
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
mattyatea
79d2b6fe9e
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
2024-01-24 16:40:37 +09:00
syuilo
5719a929ad
enhance(reversi): 変則なしマッチングを可能に
2024-01-24 16:37:06 +09:00
mattyatea
6390977653
Merge remote-tracking branch 'misskey-original/develop' into develop
2024-01-21 13:44:29 +09:00
syuilo
a17251d913
enhance(reversi): tweak reversi
2024-01-21 10:07:43 +09:00
mattyatea
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
syuilo
a637b4e282
feat: reversi
...
Resolve #12962
2024-01-19 20:51:49 +09:00
mattyatea
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
YS
d92aaf81c4
refactor: noteテーブルのインデックス整理と配列カラムへのクエリでインデックスを使うように ( #12993 )
...
* Optimize note model index
* enhance(backend): ANY()をやめる (MisskeyIO#239)
* add small e2e test drive endpoint
---------
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
2024-01-15 08:19:27 +09:00
mattyatea
33507e24ff
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/models/_.ts
# packages/backend/src/postgres.ts
# packages/frontend/src/components/MkDrive.file.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/router.ts
# packages/frontend/src/ui/universal.vue
2024-01-11 21:46:28 +09:00
syuilo
cf54c2ba47
feat: ranking system of bubble game
...
Resolve #12961
2024-01-11 18:13:39 +09:00
mattyatea
eb1ce55304
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/MkSignupDialog.form.vue
2024-01-06 23:47:45 +09:00
Chocolate Pie
072f67d6e7
feat: Add support for mCaptcha ( #12905 )
...
* feat: Add support for mCaptcha
* fix: Fix docker compose configuration
* chore(frontend/docs): update changelog & fix eslint errors
* `@mcaptcha/vanilla-glue`をダイナミックインポートするように
* chore: Add missing prefix to CHANGELOG
* refactor(backend): 適当につけた変数の名前を変更
2024-01-06 20:14:33 +09:00
mattyatea
085a93b9fc
AvatarDecoration federation
...
and more fix
2024-01-04 14:16:28 +09:00
mattyatea
09b1bac3ad
bug fix
2024-01-03 01:33:20 +09:00
mattyatea
6a06ec1347
2023.12.2-PrisMisskey.2
...
bug fix
2024-01-03 01:32:22 +09:00
mattyatea
b7102f67af
アイコンデコレーションのカテゴリ
2024-01-03 01:26:44 +09:00
まっちゃてぃー。
8f73d4b567
Merge branch 'develop' into report
2024-01-02 20:13:54 +09:00
mattyatea
74e45b13eb
Feat: GDPRモードを追加した
...
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
2023-12-31 18:19:59 +09:00
mattyatea
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
MomentQYC
7948018e6a
feat: Add support for TrueMail ( #12850 )
...
Co-authored-by: MarryDream <2190758465@qq.com>
2023-12-29 18:23:29 +09:00
mattyatea
cb1586658e
Merge remote-tracking branch 'mi-dev/master' into report
2023-12-28 04:16:03 +09:00
mattyatea
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
おさむのひと
36701f8a7c
fix(backend): 1702718871541-ffVisibility.jsのdownが壊れている ( #12767 )
2023-12-24 15:24:26 +09:00
mattyatea
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
GrapeApple0
5b5a537f56
feat: 登録を拒否するメールアドレスのドメインを手動で設定できるように ( #12740 )
...
* feat: 使い捨てアドレスのドメインを手動で設定できるように
* Update CHANGELOG.md
* disposableEmailDomains -> bannedEmailDomains
* isBlockedHostを使うように
2023-12-23 12:06:22 +09:00
mattyatea
a03814feae
多分動くと思うからリリースしようぜ
2023-12-23 10:52:18 +09:00
mattyatea
68b48bc16f
Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop
...
# Conflicts:
# CHANGELOG.md
# locales/index.d.ts
# locales/ja-JP.yml
# packages/backend/src/core/CustomEmojiService.ts
# packages/backend/src/models/RepositoryModule.ts
# packages/backend/src/server/api/EndpointsModule.ts
# packages/backend/src/server/api/endpoints.ts
# packages/backend/src/server/api/endpoints/admin/emoji/update.ts
# packages/frontend/src/components/MkCustomEmojiEditLocal.vue
# packages/frontend/src/components/MkCustomEmojiEditRemote.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/admin/roles.editor.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/emojis.emoji.vue
2023-12-23 09:30:48 +09:00
mattyatea
487b3089a0
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# README.md
# packages/frontend/src/components/MkMenu.vue
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkNoteSimple.vue
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/widgets/WidgetInstanceInfo.vue
2023-12-23 09:14:17 +09:00
zawa-ch
4e2d802967
enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように ( #12702 )
...
* Enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12072 )
* refactor: crowdin 編集部分のコミットを打ち消し
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158
* refactor: オブジェクトの名前修正
https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158
* fix: 設定項目の説明を削除
名称が具体的になって必要なくなったため
https://github.com/misskey-dev/misskey/pull/12702#discussion_r1429932463
2023-12-18 20:59:20 +09:00
mattyatea
6849d510ac
Feat: 複数ノートの通報機能
2023-12-10 09:17:24 +09:00