mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2025-01-08 19:04:05 +09:00
Code
24,536 Commits 31 Branches 130 Tags 139 MiB
28f0522186
Commit Graph

1396 Commits

Author SHA1 Message Date
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
7107bf2fc1 Merge commit 'refs/pull/10628/head' of https://github.com/misskey-dev/misskey into develop 2023-06-19 16:54:53 +09:00
NoriDev
eba092e319 fix lint 2023-06-19 16:44:56 +09:00
NoriDev
5ff28f08a9 fix jest 2023-06-19 04:04:24 +09:00
ssmucny
a5dcc8264d update event types for federation 2023-06-18 13:39:43 -04:00
NoriDev
42cc15d7f8 tweak 0491042d 2023-06-19 01:12:56 +09:00
NoriDev
54545fb501 Merge pull request #10949 from misskey-dev 2023-06-18 19:37:54 +09:00
caipira113
47d0116a8e tweak 610780c8 2023-06-18 19:13:08 +09:00
caipira113
d04df47f7d Add Cloud Logging Support 2023-06-18 19:11:42 +09:00
NoriDev
c1f6c3ac83 Merge pull request #10628 from misskey-dev/develop 2023-06-18 04:51:25 +09:00
Sam Smucny
30f43e771e
Merge branch 'develop' into ssmucny-events 2023-06-17 15:32:34 -04:00
caipira113
ebbd759a03
fix(backend): Resolve issue with UserGroupInvitation in notifications 
This commit resolves the issue of `Internal error occurred in i/notifications: Could not find any entity of type "UserGroupInvitation"`.
 2023-06-17 04:09:58 +09:00
NoriDev
3ccefa7b00 delete description 2023-06-17 03:12:24 +09:00
NoriDev
9eb989af1f Update package.json 2023-06-16 22:31:02 +09:00
NoriDev
245ec7a68a Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-14 21:17:35 +09:00
syuilo
f5dfb64a52 ユーザー統計表示機能を削除 
Resolve #10998
 2023-06-13 14:13:33 +09:00
NoriDev
53a4e4054d misskey-js -> cherrypick-js 2023-06-12 16:35:30 +09:00
NoriDev
fc413756e3 feat(client): プロフィールを翻訳する機能を追加 2023-06-11 21:55:01 +09:00
Chocolate Pie
f495296a77
Merge branch 'develop' into flash-request-token 2023-06-11 15:55:15 +09:00
Chocolate Pie
0329b7acab Revert "Merge remote-tracking branch 'upstream/develop' into flash-request-token" 
This reverts commit e045aa2661.
 2023-06-11 15:53:13 +09:00
Chocolate Pie
e045aa2661 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-11 15:50:38 +09:00
NoriDev
6723ef9052 ノートの検索をローカル/リモート/全てで分けられるように変更 2023-06-10 20:44:27 +09:00
tamo-morita
5c0e14f436 ノートの検索をローカル/リモート/全てで分けられるように変更 2023-06-10 20:44:10 +09:00
Nyamori
f45745af5a メディアタイムライン追加 2023-06-10 20:23:45 +09:00
NoriDev
25029ac671 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-10 19:19:36 +09:00
NoriDev
1955628dd9 CherryPick🍒 2023-06-10 19:18:49 +09:00
syuilo
46222d0258 tweak of f3a16bcd6 2023-06-10 17:41:52 +09:00
nenohi
f3a16bcd6d
ロールのユーザーリストを非公開にできるように (#10987) 
* ロールのユーザーリストを非公開にできるように

* Changelog update
 2023-06-10 17:26:48 +09:00
syuilo
e8420ad90b fix(backend): キャッシュが溜まり続けないように 
Related #10984
 2023-06-10 13:45:11 +09:00
Chocolate Pie
5ae91f5f23 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-10 10:38:43 +09:00
NoriDev
142245980a Update icon 2023-06-09 23:11:35 +09:00
NoriDev
37cca3b7f1 CherryPick🍒 2023-06-09 22:55:20 +09:00
NoriDev
8df65eb125 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-09 20:19:58 +09:00
NoriDev
635765eacc Merge remote-branch 'misskey/develop' 2023-06-09 20:06:13 +09:00
syuilo
6182a1cb2c enhance(backend): WebSocketのPing/Pongをプロトコル制御フレームの物で判別する 
Resolve #10969
 2023-06-09 17:07:57 +09:00
syuilo
308ab8f177 chore 2023-06-09 16:11:28 +09:00
Ebise Lutica
34a32a8334
エラー画像URLを設定可能に (#10959) 
* エラー画像URLを設定可能に

* Update CHANGELOG.md

* 設定したエラーアイコンをprefetchするようにbase.pugを変更

* 不足していたデータを追加

* enhance(frontend): デザイン調整
 2023-06-09 14:00:53 +09:00
syuilo
703f3a8e37 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-09 12:51:19 +09:00
syuilo
13870c63b0 add note 2023-06-09 12:47:36 +09:00
Outvi V
95b2148bfe
fix: correctly check the sensitivity flag (#10976) 2023-06-09 10:13:46 +09:00
NoriDev
efa2abef85 refactor(server): mfm-js to cherrypick-mfm-js 2023-06-07 20:26:12 +09:00
Chocolate Pie
7b63146d98 Fix Vulnerability 2023-06-07 11:00:56 +09:00
Chocolate Pie
81eb257cf1 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-06 08:39:23 +09:00
NoriDev
147835e72a Merge remote-branch 'misskey/develop' 2023-06-06 01:55:41 +09:00
CaffeeLake
8263cc0094
Fix: #10955 TypeError: JSON5.parse is not a function (#10956) 
* Fix: JSON5.parse is not a function

* update changelog

* update chglog

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2023-06-05 21:44:28 +09:00
NoriDev
21da7746be Merge remote-branch 'misskey/develop' 2023-06-05 20:51:42 +09:00
tamaina
565c502bbf fix(backend): pageのピン留めを解除することができない問題を修正 
Fix #10950
 2023-06-05 09:04:30 +00:00
NoriDev
99e4482a4f Update flush.pug 2023-06-05 16:53:48 +09:00