mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-12 05:38:55 +09:00
Code
25,307 Commits 30 Branches 126 Tags 135 MiB
6875920648
Commit Graph

80 Commits

Author SHA1 Message Date
NoriDev
2ec464653d Merge remote-branch 'misskey/develop' 2023-09-18 17:14:22 +09:00
syuilo
0260a6af85
fix test 2023-09-17 15:11:33 +09:00
syuilo
fba08c6310 fix 2023-09-17 14:36:57 +09:00
NoriDev
a485758e9a Merge remote-branch 'misskey/develop' 2023-09-15 16:45:00 +09:00
syuilo
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
NoriDev
5d9549e4c6 Merge remote-branch 'misskey/develop' 2023-09-08 17:13:32 +09:00
syuilo
ff9a65e8fa
feat: passkey support (#11804) 
https://github.com/MisskeyIO/misskey/pull/149
 2023-09-08 14:05:03 +09:00
NoriDev
a871a0aa1b lint 2023-09-01 17:47:29 +09:00
NoriDev
b7f3f45db2 Merge remote-branch 'misskey/develop' 2023-08-29 16:46:47 +09:00
syuilo
257c4fccf1
feat: Refine 2fa (#11766) 
* wip

* Update 2fa.qrdialog.vue

* Update 2fa.vue

* Update CHANGELOG.md

* tweak

* ✌️
 2023-08-28 18:25:31 +09:00
NoriDev
ecfb0e8419 Merge remote-branch 'misskey/develop' 2023-08-22 17:34:14 +09:00
MomentQYC
388448f298
feat: Removing stack trace info in production env (#11657) 
* feat: Hiding stack traces in production env

* sytle

* style

* style

* add SPDX

* move ./error.js to ./misc/error.js

* revert: remove frontend changes

* feat: Hiding stack traces in production env

* feat: Hiding stack traces in production env

* revert

* revert

* revert

* change and fix

* revert

* fix queue endpoint test

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
 2023-08-21 17:21:57 +09:00
NoriDev
75ba0c52bd Merge remote-branch 'misskey/develop' 2023-08-18 17:02:13 +09:00
syuilo
792622aead
refactor: prefix Mi for all entities (#11719) 
* wip

* wip

* wip

* wip

* Update RepositoryModule.ts

* wip

* wip

* wip

* Revert "wip"

This reverts commit c1c13b37d2aaf3c65bc148212da302b0eb7868bf.
 2023-08-16 17:51:28 +09:00
NoriDev
6958bcf1a3 Merge remote-branch 'misskey/develop' 2023-08-16 17:13:56 +09:00
syuilo
9487856495
feat: refine announcement (#11497) 
* wip

* Update read-announcement.ts

* wip

* wip

* wip

* Update index.d.ts

* wip

* Create 1691649257651-refine-announcement.js

* wip

* wip

* wip

* wip

* wip

* wip

* Update announcements.vue

* wip

* wip

* Update announcements.vue

* wip

* Update announcements.vue

* wip

* Update misskey-js.api.md

* Update users.ts

* Create MkAnnouncementDialog.stories.impl.ts

* wip

* wip

* Create AnnouncementService.ts
 2023-08-13 20:12:29 +09:00
NoriDev
61c871517d Merge remote-branch 'misskey/develop' 2023-08-01 17:16:39 +09:00
NoriDev
0676c73a9d Merge remote-branch 'misskey/master' 2023-07-28 19:28:30 +09:00
syuilo
ab3cd7b837 chore: add missing license identifier 2023-07-28 14:02:58 +09:00
Kagami Sascha Rosylight
eb7b5f905a
feat(backend): support OAuth 2.0 authorization (#11053) 
* feat(backend): support OAuth 2.0 authorization

* secureRndstr fix

* nanndekowareta

* nanndekowareta2

* nanndekowareta3

* unref?

* refactor to not close fastify

* use microformats-parser

* Update OAuth2ProviderService.ts

* clarify the reason behind dns lookup

* refactor(backend): use @types/oauth2orize-pkce (#11350)

* refactor(backend): use @types/oauth2orize-pkce

* Update package.json

* Update pnpm-lock.yaml

---------

Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>

---------

Co-authored-by: mtgto <hogerappa@gmail.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-07-27 18:51: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
猫ロキP@deflis
5083458071
refactor: forkでデフォルトのノート文字数を変更した場合、E2Eテストが落ちる問題を修正する (#11366) 
* forkでデフォルトのノート文字数を変更した場合このテストが落ちる問題を修正する

* 文字数についてのコメントを追加しておく
 2023-07-27 09:00:48 +09:00
NoriDev
4d94cb74a9 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-28 15:46:44 +09:00
Kagami Sascha Rosylight
1b1f82a2e2
feat(backend): accept OAuth bearer token (#11052) 
* feat(backend): accept OAuth bearer token

* refactor

* Update packages/backend/src/server/api/ApiCallService.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* Update packages/backend/src/server/api/ApiCallService.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* fix

* kind: permission for account moved error

* also for suspended error

* Update packages/backend/src/server/api/StreamingApiServerService.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

---------

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-06-28 13:37:13 +09:00
NoriDev
b6979b0437 Merge remote-branch 'misskey/develop' 2023-06-26 16:52:07 +09:00
Kagami Sascha Rosylight
d23ad8b511
fix(backend): APIエラーのHTTP status code変更 (#11047) 2023-06-26 10:09:12 +09:00
Kagami Sascha Rosylight
ef354e94f2
refactor(backend): replace rndstr with secureRndstr (#11044) 
* refactor(backend): replace rndstr with secureRndstr

* Update pnpm-lock.yaml

* .js
 2023-06-25 11:04:33 +09:00
Kagami Sascha Rosylight
7bb8c71543
chore(backend, misskey-js): add type for signup (#11043) 
* chore(backend, misskey-js): add type for signup

* rerun
 2023-06-25 08:34:18 +09:00
NoriDev
fec18294e0 fix test 2023-06-20 04:30:34 +09:00
NoriDev
030597e572 fix jest 2023-06-19 20:03:56 +09:00
NoriDev
38ab7141f2 fix jest 2023-06-19 19:06:09 +09:00
NoriDev
5ff28f08a9 fix jest 2023-06-19 04:04:24 +09:00
NoriDev
53a4e4054d misskey-js -> cherrypick-js 2023-06-12 16:35:30 +09:00
NoriDev
287e1867a3 Merge remote-branch 'misskey/develop' 2023-06-04 15:45:23 +09:00
syuilo
1177528c25 fix backend e2e 2023-06-04 14:03:46 +09:00
NoriDev
a467f1d72c Merge remote-branch 'misskey/develop' 2023-05-23 17:27:08 +09:00
Nanashia
15db0b8812
test(backend): Add tests for antennas (#10868) 2023-05-19 20:53:20 +09:00
syuilo
d10d5a8d53 enhance: タイムラインにフォロイーの行った他人へのリプライを含めるかどうかの設定をアカウントに保存するのをやめるように 
Resolve #10646
 2023-05-16 12:16:37 +09:00
NoriDev
e13f0f10c5 cherrypick 2023-05-14 17:49:32 +09:00
NoriDev
c11aa0f336 Merge remote-branch 'misskey/master' 2023-05-13 19:50:38 +09:00
NoriDev
a3ea3bba41 Merge remote-branch 'ltlapy/develop-v13' 2023-05-12 20:25:08 +09:00
syuilo
b380dc53e1 fix typo 2023-05-11 16:22:46 +09:00
nenohi
c15b75e477
センシティブワードを正規表現、CWにも適用するように (#10688) 
* cwにセンシティブが効いてない

* CWが無いときにTextを見るように

* 比較演算子間違えた

* とりあえずチェック

* 正規表現対応

* /test/giにも対応

* matchでしなくてもいいのでは感

* レビュー修正

* Update packages/backend/src/core/NoteCreateService.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* Update packages/backend/src/core/NoteCreateService.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* 修正

* wipかも

* wordsでスペース区切りのものできたかも

* なんか動いたかも

* test作成

* 文言の修正

* 修正

* note参照

---------

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2023-05-10 18:02:41 +09:00
syuilo
adf66154d2 fix test 2023-05-10 15:59:34 +09:00
syuilo
ae5a72a2df feat: 投稿したコンテンツのAIによる学習を軽減するオプションを追加 
Resolve #10819
 2023-05-10 10:52:41 +09:00
ltlapy
78db91d63e Bump base into v13.12.1 2023-05-09 16:06:32 +09:00
syuilo
5c54e12099 fix(test): ジョブキューをテストが終わったら停止するように 
Fix #10802 ?
 2023-05-09 08:32:25 +09:00
syuilo
8957a89024 update test 2023-05-07 17:38:06 +09:00
syuilo
50985b2ffd fix test 2023-05-07 16:42:19 +09:00
syuilo
61c12290fd fix test 2023-05-07 16:41:37 +09:00