mattyatea
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
syuilo
be11fd7508
enhance: サーバーのお問い合わせ先URLを設定できるように
2024-05-31 10:12:23 +09:00
mattyatea
206d7c9a18
outsideprismisskey
2024-05-04 23:21:05 +09:00
mattyatea
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
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
9c905f84e8
a
2024-02-16 20:36:23 +09:00
mattyatea
e074d975e1
update README.md
2024-02-16 19:07:52 +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
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
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
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
まっちゃてぃー。
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
d19a4ab8a3
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/stream/ChannelsService.ts
# packages/frontend/src/components/MkPostForm.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/mute-block.vue
2023-12-28 04:42:28 +09:00
Chocolate Pie
c96bc36fed
Merge pull request from GHSA-7pxq-6xx9-xpgm
...
* fix: fix improper authorization when accessing with third-party application
* refactor: refactor type definitions
* fix: get rid of unnecessary access limitation
* enhance: サードパーティアプリケーションがWebsocket APIを使えるように
* fix: add missing parentheses
* Revert "fix(backend): add missing kind definition for admin endpoints to improve security"
This reverts commit 5150053275
.
* frontend: 翻訳の抜けを訂正, read:adminとwrite:adminはアクセス発行トークンのデフォルトでは非表示にする
* enhance(test): misskey-ghsa-7pxq-6xx9-xpgmに関するテストを追加
* enhance(test): Websocket APIに対するテストも追加
* enhance(refactor): `@/misc/api-permissions.ts`を`misskey-js/permissions`に統合
* fix(frontend): アクセストークン発行UIで全ての権限を有効にした際、管理者用APIへのアクセスも許可してしまう問題を修正
* enhance(backend): Websocketの接続に最低限必要な権限を変更
* fix(backend): `/api/admin/meta`をサードパーティアプリケーションからはアクセスできないように
* fix(backend): エンドポイントにアクセスするために必要な権限を変更
* fix(frontend/locale): Add missing type declaration
* chore: update `misskey-js/src/autogen`
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2023-12-27 15:08:59 +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
zyoshoka
75034d9240
refactor(frontend): Reactivityで型を明示するように ( #12791 )
...
* refactor(frontend): Reactivityで型を明示するように
* fix: プロパティの参照が誤っているのを修正
* fix: 初期化の値を空配列に書き換えていた部分をnullに置き換え
2023-12-26 14:19:35 +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
2a9ddf2bc8
多分動くと思うからリリースしようぜ
2023-12-23 10:44:01 +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
syuilo
5150053275
fix(backend): add missing kind definition for admin endpoints to improve security
2023-12-18 12:32:26 +09:00
mattyatea
8c4a08c383
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# locales/index.d.ts
# locales/ja-JP.yml
# package.json
# packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
# packages/backend/src/server/api/endpoints/admin/meta.ts
# packages/backend/src/server/api/endpoints/channels/timeline.ts
# packages/backend/src/server/api/endpoints/notes/featured.ts
# packages/frontend/src/components/MkButton.vue
# packages/frontend/src/components/MkClickerGame.vue
# packages/frontend/src/components/MkDialog.vue
# packages/frontend/src/components/MkDrive.vue
# packages/frontend/src/components/MkEmojiEditDialog.vue
# packages/frontend/src/components/MkEmojiPicker.section.vue
# packages/frontend/src/components/MkEmojiPicker.vue
# packages/frontend/src/components/MkFollowButton.vue
# packages/frontend/src/components/MkInstanceTicker.vue
# packages/frontend/src/components/MkLaunchPad.vue
# 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/MkRadio.vue
# packages/frontend/src/components/MkSignupDialog.form.vue
# packages/frontend/src/components/MkSwitch.vue
# packages/frontend/src/custom-emojis.ts
# packages/frontend/src/pages/about.emojis.vue
# packages/frontend/src/pages/about.vue
# packages/frontend/src/pages/admin/index.vue
# packages/frontend/src/pages/admin/other-settings.vue
# packages/frontend/src/pages/custom-emojis-manager.vue
# packages/frontend/src/pages/settings/general.vue
# packages/frontend/src/pages/settings/mute-block.vue
# packages/frontend/src/pages/timeline.vue
# packages/frontend/src/pages/user/home.vue
# packages/frontend/src/pages/user/index.files.vue
# packages/frontend/src/scripts/get-note-menu.ts
# packages/frontend/src/store.ts
# packages/frontend/src/ui/_common_/stream-indicator.vue
# packages/frontend/src/ui/classic.sidebar.vue
# packages/frontend/src/ui/universal.vue
# packages/frontend/src/ui/universal.widgets.vue
# packages/frontend/vite.config.ts
# packages/misskey-js/etc/misskey-js.api.md
# packages/misskey-js/src/api.types.ts
# packages/misskey-js/src/entities.ts
# packages/misskey-js/src/streaming.types.ts
2023-12-13 07:08:57 +09:00
おさむのひと
336416261a
バックエンドが生成するapi.jsonからmisskey-jsの型を作成する ( #12434 )
...
* ひとまず生成できるところまで
* ファイル構成整理
* 生成コマンド整理
* misskey-jsへの組み込み
* fix generator.ts
* wip
* fix generator.ts
* fix package.json
* 生成ロジックの調整
* 型レベルでのswitch-case機構をmisskey-jsからfrontendに持ち込めるようにした
* 型チェック用のtsconfig.jsonを作成
* 他のエンドポイントを呼ぶ関数にも適用
* 未使用エンティティなどを削除
* misskey-js側で手動定義されていた型を自動生成された型に移行(ただしapi.jsonがvalidでなくなってしまったので後で修正する)
* messagingは廃止されている(テストのビルドエラー解消)
* validなapi.jsonを出力できるように修正
* 修正漏れ対応
* Ajvに怒られて起動できなかったところを修正
* fix ci(途中)
* パラメータenumをやめる
* add command
* add api.json
* 都度自動生成をやめる
* 一気通貫スクリプト修正
* fix ci
* 生成ロジック修正
* フロントの型チェックは結局やらなかったので戻しておく
* fix pnpm-lock.yaml
* add README.md
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-12-02 21:00:05 +09:00
mattyatea
ff79746100
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/backend/src/models/json-schema/user.ts
# packages/frontend/src/components/MkNote.vue
# packages/frontend/src/components/MkReactionsViewer.reaction.vue
# packages/frontend/src/pages/settings/mute-block.word-mute.vue
# packages/misskey-js/etc/misskey-js.api.md
2023-11-24 22:44:42 +09:00
皐月なふ (Nafu Satsuki)
18bdec9641
fix: verifymail.io APIの設定項目が反映されない ( #12399 )
2023-11-22 10:13:46 +09:00
mattyatea
7bc183cbb7
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
# packages/frontend/src/scripts/mfm-tags.ts
2023-11-17 13:28:42 +09:00
syuilo
9d78a1a8b3
enhance(backend): make ftt db fallback configurable
2023-11-16 10:20:57 +09:00
mattyatea
cc5037cb85
Merge remote-tracking branch 'misskey-original/develop' into develop
...
# Conflicts:
# package.json
# packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
# packages/frontend/package.json
2023-10-23 19:29:34 +09:00
syuilo
e6c54de814
enhance(backend): RedisへのTLのキャッシュをオフにできるように
2023-10-23 15:17:25 +09:00
mattyatea
4f6b0ccf6b
emoji
2023-10-19 01:16:11 +09:00
まっちゃてぃー
5efd01ba70
feat: サーバーサイレンス機能を追加 ( #12031 )
...
* feat : サーバーサイレンスを追加
* Update CHANGELOG.md
* Update CHANGELOG.md
* Update locale
* Update instance-info.vue
* update misskey-js.api.md
* lint fix
* migration fix
* 既存のものを使うように
* fix
* 色々直した
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/pages/admin/instance-block.vue
* Update packages/frontend/src/components/MkInstanceCardMini.vue
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/entities/InstanceEntityService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* Update packages/backend/src/core/UserFollowingService.ts
* fix: サイレンスされてるサーバーからの投稿は全部ホームにする
* fix: undefinedでfalseを返すようにした
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-16 20:11:27 +09:00
かっこかり
4bbfc98883
Feat: タイムライン更新中に広告を挿入 ( #11989 )
...
* Feat: タイムライン更新中に広告を挿入
* 翻訳を変更
* Run api extractor
* fix api extractor
* Update locales/ja-JP.yml
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
* confirm -> mkinfo
* MkInputにmin, maxを指定できるように
* 負の値が指定されたら何もしない
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-10-08 17:56:44 +09:00
かっこかり
5e8c0deab3
プライバシーポリシー・運営者情報のリンクを追加 ( #11925 )
...
* 運営者情報・プライバシーポリシーリンクを追加
* Update Changelog
* Run api extractor
* プライバシーポリシー・利用規約の同意をまとめる
* Update Changelog
* fix lint
* fix
* api extractor
* improve design
* nodeinfoにプライバシーポリシー・運営者情報を追加
2023-10-07 13:13:13 +09:00
syuilo
17b83ff4c1
enhance: TLキャッシュ容量を設定できるように
2023-10-04 08:46:27 +09:00
syuilo
8f77350089
enhance: PWAのshort_nameを設定可能に
2023-09-23 12:38:20 +09:00
syuilo
814e28459e
enhance(backend): improve server icon setting
...
Resolve #11481
Resolve #10901
2023-09-16 17:05:17 +09:00
woxtu
dd1783f984
chore(backend): Resolve `import/no-default-export` rule violations ( #11732 )
...
* Disable `import/no-default-export` properly
* Disable `import/no-default-export`
2023-08-17 21:20:58 +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
Kagami Sascha Rosylight
d5f30ecb86
feat(backend): allow disabling cache for sensitive files ( #11245 )
...
* feat(backend): allow disabling cache for sensitive files
* Update CHANGELOG.md
* fix storybook
* Update locales/ja-JP.yml
---------
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-07-15 20:12:20 +09:00
syuilo
af3258dc79
perf(backend): make some features optionable
...
Resolve #11064
Resolve #11065
2023-07-02 16:02:32 +09:00