mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-26 20:48:25 +09:00
Code
25,993 Commits 30 Branches 126 Tags 136 MiB
86468255bc
Commit Graph

25993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
syuilo
981e6f996e fix(frontend): タブがアクティブな間はstreamが切断されないように 
Fix #10952
 2023-06-06 09:04:57 +09:00
Chocolate Pie
81eb257cf1 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-06 08:39:23 +09:00
Chocolate Pie
08b6a2008a Fix translate 2023-06-06 07:54:27 +09:00
NoriDev
147835e72a Merge remote-branch 'misskey/develop' 2023-06-06 01:55:41 +09:00
NoriDev
baf1482fdb fix typo 2023-06-06 01:38:04 +09:00
NoriDev
f167691a7c docs: MFMヘルプドキュメントの更新 2023-06-06 01:30:22 +09:00
NoriDev
f690477229 feat(client): mfm-cheat-sheetの復元 2023-06-06 01:12:20 +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
ebceebcbbf restore mfm-cheat-sheet 2023-06-05 21:39:53 +09:00
tamaina
fa051a2a5f 🎨 2023-06-05 12:35:23 +00:00
tamaina
ce252143c3 chore: Please write more detailed environmental information in your bug report. 2023-06-05 12:29:52 +00:00
NoriDev
21da7746be Merge remote-branch 'misskey/develop' 2023-06-05 20:51:42 +09:00
NoriDev
25a6b3f86e Update index.js 2023-06-05 20:47:57 +09:00
NoriDev
d56b50a5f1 feat(client): ページの更新が必要なときに静かに通知する機能を追加 2023-06-05 20:47:49 +09:00
syuilo
407a965c1d
Merge pull request #10932 from misskey-dev/develop 
Release: 13.13.0
 2023-06-05 19:47:08 +09:00
syuilo
259be258aa Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-05 18:06:44 +09:00
Yuriha
2d5bb40ad0
Condensedlines reflow once (#10944) 
* perf: Update MkCondensedLine styles after reading all dimensions

* perf: reduce reflow in MkCondensedLine

* lint

* Update packages/frontend/src/components/global/MkCondensedLine.vue

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

* Update packages/frontend/src/components/global/MkCondensedLine.vue

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

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2023-06-05 18:06:33 +09:00
syuilo
db7fb1c688 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-05 18:05:32 +09:00
syuilo
6b0685a25c
[ci skip] New Crowdin updates (#10947) 
* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Chinese Traditional)
 2023-06-05 18:05:20 +09:00
syuilo
618d07158a 13.13.0 2023-06-05 18:05:03 +09:00
syuilo
a63a417fd4 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-05 18:04:54 +09:00
syuilo
4443dba717 Update basic.cy.js 2023-06-05 18:04:51 +09:00
tamaina
565c502bbf fix(backend): pageのピン留めを解除することができない問題を修正 
Fix #10950
 2023-06-05 09:04:30 +00:00
tamaina
9e716fd813 fix(frontend): MkUserPopupが省略されないのを修正 
Fix #10870
 2023-06-05 08:58:00 +00:00
syuilo
34e1b52b38 Update e2e.js 2023-06-05 17:45:24 +09:00
NoriDev
2cc10aa02d Update main-boot.ts 2023-06-05 17:27:45 +09:00
NoriDev
7fb5df149f localeの整列を変更 2023-06-05 17:18:06 +09:00
NoriDev
206ca5c90d fix typo: newNoteRecivedNotification -> newNoteReceivedNotification 2023-06-05 17:16:00 +09:00
NoriDev
99e4482a4f Update flush.pug 2023-06-05 16:53:48 +09:00
NoriDev
31282b6cc6 Update error.pug 2023-06-05 16:53:22 +09:00
NoriDev
fcecc916d8 Update error.css 2023-06-05 16:52:54 +09:00
NoriDev
69c4dfaf0b Update style.css 2023-06-05 16:52:42 +09:00
NoriDev
66bab3551d Update CherryPick color🎨 2023-06-05 16:52:30 +09:00
NoriDev
25e0b5ff88 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-05 16:05:06 +09:00
mappi
6d68edaee8
Update CHANGELOG.md 2023-06-05 14:49:34 +09:00
ssmucny
fbe451f083 Fixes to event editor 2023-06-04 23:21:34 -04:00
mappi-pr
38ae4ac289 Lint 2023-06-05 12:02:47 +09:00
mappi-pr
e9d36da36a fix,Lint,add animation 2023-06-05 11:41:44 +09:00
ssmucny
1f5b368f5c Merge branch 'ssmucny-events' of https://github.com/ssmucny/misskey into ssmucny-events 2023-06-04 22:20:07 -04:00
ssmucny
77018c54cd update event editor fields 2023-06-04 22:19:55 -04:00
Sam Smucny
95e9cd86bb
Merge branch 'develop' into ssmucny-events 2023-06-04 22:18:25 -04:00
syuilo
0cb3c7481c fix typo: schema -> scheme 2023-06-05 10:55:18 +09:00
Chocolate Pie
694a6a302c ✨ 2023-06-05 09:03:58 +09:00
Chocolate Pie
ba3ee6dfe0 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-05 08:16:33 +09:00
Chocolate Pie
99446d440e Api Tokenを要求できる関数を追加 (misskey-dev/misskey#10911) 2023-06-05 08:10:15 +09:00
mappi
f06fe5a44b Lint 2023-06-05 01:39:13 +09:00
mappi
a9e059a0f0 fix 2023-06-05 01:34:27 +09:00
mappi
fe8725fc88 add animation 2023-06-04 22:40:09 +09:00
mappi
d59dddb15b add common parts, change design 2023-06-04 18:32:09 +09:00
NoriDev
982729276f 13.13.0-beta.7-cp-4.0.0+fb09d88 2023-06-04 17:41:22 +09:00