worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
26925 commits 2 branches 1049 tags 155 MiB
Commit graph

278 commits

Author SHA1 Message Date
NoriDev 88a2966c3b Merge remote-branch 'misskey/develop' 2023-12-18 17:41:33 +09:00
NoriDev a5d17997af update cherrypick-mfm-js 2023-12-18 16:59:49 +09:00
zyoshoka 13990279c3
enhance: Unicode 15.0で新たに追加された絵文字をリアクションに使えるように (#12683) 2023-12-18 14:51:29 +09:00
syuilo 507d436699 update mfm-js 2023-12-18 13:22:34 +09:00
syuilo 8a9f4ef441 update deps 2023-12-18 13:14:58 +09:00
syuilo 2ecc0299b4 update deps 2023-12-16 14:00:27 +09:00
NoriDev 8f65b96d82 Merge remote-branch 'misskey/develop' 2023-12-15 02:48:07 +09:00
おさむのひと 386fcedf35
(dev-mode) devモードの改善 (#12639) 
* fix dev-mode

* fix dev-mode

* fix dev-mode

* fix dev-mode

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-12-14 20:16:02 +09:00
NoriDev 463368277b Merge remote-branch 'misskey/develop' 2023-12-14 20:15:56 +09:00
NoriDev e5423228b8 Merge remote-branch 'misskey/develop' 2023-12-14 19:48:32 +09:00
syuilo a2a6a94614 update deps 2023-12-14 18:28:04 +09:00
syuilo aedc1d0ee9 update deps 2023-12-14 13:22:12 +09:00
NoriDev ac8d0f133e Merge remote-branch 'misskey/develop' 2023-12-13 13:28:20 +09:00
syuilo 319267e096 update deps 2023-12-09 13:02:14 +09:00
おさむのひと b0039f0946
chore: 開発モードでフロントエンドとバックエンドを独立して起動するようにする（再） (#12593) 
* [wip]run standalone vite

* [wip]run standalone vite

* some fix (tabler icons, sw, streaming)

* fix theme

* fix run scripts

* favicon

* client-assets

* cssの読み込み順序とCSP設定の変更

* fix lang change

* fix clientManifest

* baseを相対パスにしてドメイン直下とサブディレクトリ配下両方に対応

* 色々修正

* 色々修正

* 色々修正

* fix

* Revert "client-assets"

This reverts commit 582601e90eb771875bdf8aba263da2316a59d01b.

# Conflicts:
#	packages/frontend/vite.config.ts

* 色々修正

* fix

* fix

* add url and proxy to server proxy

* Update packages/frontend/src/index.html

* wip

* Merge remote-tracking branch 'origin/develop' into feat/launch-standalone-frontend

# Conflicts:
#	packages/frontend/src/pages/welcome.entrance.a.vue

* Merge remote-tracking branch 'origin/develop' into feat/launch-standalone-frontend

# Conflicts:
#	packages/frontend/src/pages/welcome.entrance.a.vue

* fix tabler load

* Apply suggestions from code review

* Update packages/frontend/src/index.html

* fix

* fix vite.config.local-dev.ts

* fix CONTRIBUTING.md

---------

Co-authored-by: FruitRiin <nassii74@gmail.com>
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: 果物リン <fruitriin@riinswork.space>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: ozelot <contact@ozelot.dev>
 2023-12-08 08:22:08 +09:00
NoriDev 16ec2754ab Merge remote-branch 'misskey/develop' 2023-12-05 17:36:02 +09:00
syuilo 9c90ff7d06 update deps 2023-12-04 19:40:46 +09:00
NoriDev 82dd4b237c Merge remote-branch 'misskey/develop' 2023-11-27 21:15:36 +09:00
syuilo 51cf906b25 update deps 2023-11-27 21:05:20 +09:00
NoriDev c9a4f543ba Merge remote-branch 'misskey/develop' 2023-11-23 16:03:31 +09:00
おさむのひと c284d41b5b
swagger-cli validateがvalidとなるapi.jsonを作れるようにする (#12403) 
* api.jsonがswagger-cli validateでエラーにならないように生成ロジックを修正

* フィールドの消し方に不備があったので変更

* バックエンドを起動しなくてもapi.jsonを作れるようにした

* deepCopyしてからレスポンス部分を作るようにした

* fix CHANGELOG.md

* securitySchemesの定義を復活＆ApiCallServiceの実装的にベアラトークンなのでその形で

* bodyが無い（空オブジェクト）のときはrequestBodyを描画しないようにする

* allowGetがtrueな項目はget用の記載も作成

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2023-11-22 17:08:56 +09:00
NoriDev dc4c61a7e7 Merge remote-branch 'misskey/develop' 2023-11-21 18:03:44 +09:00
syuilo 77ac51a680 update typescript to 5.3 2023-11-21 11:32:13 +09:00
果物リン e0de86359c
backendのプロジェクトで単体で start できないのを修正 (#12371) 2023-11-19 13:39:25 +09:00
syuilo 4f9922d46c update deps 2023-11-17 15:10:04 +09:00
Jaehong Kang 8bf82bb7db enhance(backend): Implementation of HTTP header and body validation to fix SIF-2023-002 (#12334) 
Using Buffer instead of string

Co-authored-by: perillamint <perillamint@silicon.moe>
 2023-11-15 16:26:24 +09:00
Jaehong Kang 04075ee0be
enhance(backend): Implementation of HTTP header and body validation to fix SIF-2023-002 (#12334) 
Using Buffer instead of string

Co-authored-by: perillamint <perillamint@silicon.moe>
 2023-11-15 11:13:34 +09:00
syuilo 1b71d37438 Merge pull request from GHSA-3f39-6537-3cgc 
This commit implements HTTP header and body validation to fix
[SIF-2023-002](https://advisory.silicon.moe/advisory/sif-2023-002/)

Signed-off-by: perillamint <perillamint@silicon.moe>
Co-authored-by: perillamint <perillamint@silicon.moe>
Co-authored-by: yunochi <yuno@yunochi.com>
 2023-11-14 20:45:54 +09:00
syuilo 65c5626b65
Merge pull request from GHSA-3f39-6537-3cgc 
This commit implements HTTP header and body validation to fix
[SIF-2023-002](https://advisory.silicon.moe/advisory/sif-2023-002/)

Signed-off-by: perillamint <perillamint@silicon.moe>
Co-authored-by: perillamint <perillamint@silicon.moe>
Co-authored-by: yunochi <yuno@yunochi.com>
 2023-11-14 17:09:45 +09:00
syuilo 30bb24d18c update deps 2023-11-14 10:35:48 +09:00
NoriDev f4596b4efa chore 2023-11-03 19:50:06 +09:00
NoriDev f6a6fa2d51 Merge remote-branch 'misskey/develop' 2023-11-03 17:42:10 +09:00
syuilo 1729307fcf update deps 2023-11-03 14:41:21 +09:00
NoriDev 0344aad405 Merge remote-branch 'misskey/develop' 2023-11-01 17:15:07 +09:00
syuilo 77db652bff update deps 2023-11-01 14:06:54 +09:00
NoriDev d1d024a60f Merge remote-branch 'misskey/develop' 2023-10-31 17:07:26 +09:00
syuilo a8dc6d08b1 update deps 2023-10-28 12:31:18 +09:00
NoriDev 57d42b6a8a Merge remote-branch 'misskey/develop' 2023-10-23 17:39:44 +09:00
MomentQYC 9caae8a10a
feat: Facilitates the rollback of migration operations (#12109) 
* Update package.json

* Update package.json
 2023-10-23 16:42:54 +09:00
syuilo fdeee5dd05 update deps 2023-10-23 09:20:55 +09:00
NoriDev 11564f1c22 add schemasync 2023-10-22 02:23:07 +09:00
NoriDev 303cefff17 Merge commit 'refs/pull/12109/head' of https://github.com/misskey-dev/misskey into develop 2023-10-22 02:19:44 +09:00
MomentQYC 69b1db444e
Update package.json 2023-10-21 22:18:49 +08:00
NoriDev 9ad63423dd Merge remote-branch 'misskey/develop' 2023-10-20 16:37:29 +09:00
syuilo 42a3489bcb update deps 2023-10-20 15:46:12 +09:00
NoriDev 75c8632ab9 Merge remote-branch 'misskey/develop' 2023-10-19 20:03:08 +09:00
syuilo cc256f117e update deps 2023-10-19 19:51:59 +09:00
NoriDev 933ba35069 Merge remote-branch 'misskey/develop' 2023-10-18 16:20:05 +09:00
syuilo 145c5c8b2b update deps 2023-10-18 09:43:59 +09:00
NoriDev c4b987898c Merge remote-branch 'misskey/develop' 2023-10-17 17:23:11 +09:00