161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-25 13:39:06 +01:00
Code Issues Projects Releases Packages Wiki Activity
21542 commits 10 branches 22 tags 1.5 GiB
Commit graph

1668 commits

Author SHA1 Message Date
Johann150
49686050cc backend: fix lint "no-throw-literal" 2022-08-04 13:36:37 -07:00
Johann150
d6faae48f2 fix spelling error 2022-08-04 13:34:18 -07:00
ThatOneCalculator
8abfaebab0 Merge remote-tracking branch 'misskey/develop' into develop 2022-08-04 13:31:54 -07:00
ThatOneCalculator
9e073651ff Undo more syuilo fuckup 2022-08-04 13:29:09 -07:00
syuilo
03963e8bdf feat(client): improve widget 2022-08-04 22:20:00 +09:00
Johann150
3b770c776a Collapse long notes (#8990) 
* Revert "Revert option to collapse long notes (#8561)"

This reverts commit 71150f21cd91df7bdd78a8f708db092418e85baa and reinstates
the option to collapse long notes again after they were expanded.

* fix(client): wrongly collapsed posts

* fix: don't use ref

* tweak style

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-08-01 17:55:24 +09:00
syuilo
8f3a534c64 fix: use new for throw error 
Co-Authored-By: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 2022-08-01 17:44:53 +09:00
syuilo
3058236d2f update deps 2022-07-31 22:01:01 +09:00
tamaina
946c5f1a2f feature: Client Preferences Registry (#8511) 
* Fix settings page

* nanka iroiro

* clean up

* clean up

* feature: Client Preferences Registry on the account

* add changelog

* インデックスに戻ってもタイトルが残ってしまうのを修正

* fix createdAt -> updatedAt

* remove console.log

* 適用→このデバイスに適用

* add wallpaper

* ローカルのjsonファイルを保存・読み込みできるように

* clean up

* use apiWithDialog

* Update packages/client/src/pages/settings/preferences-registry.vue

Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>

* Update packages/client/src/pages/settings/preferences-registry.vue

Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>

* Update packages/client/src/pages/settings/preferences-registry.vue

Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>

* fix lint

* ✌️

* change router

* nanka iroiro

* tweak

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
 2022-07-31 21:55:20 +09:00
syuilo
a57b524f9f use es2021 for node 2022-07-31 14:20:10 +09:00
ThatOneCalculator
92295d9335 typo 2022-07-29 15:23:53 -07:00
ThatOneCalculator
894cb76baf revers 2022-07-29 15:07:07 -07:00
ThatOneCalculator
f4eafae86d test 2022-07-29 09:27:39 -07:00
ThatOneCalculator
e150685203 try new query 2022-07-29 09:17:10 -07:00
ThatOneCalculator
9d315aa1e1 try to fix streaming 2022-07-29 08:57:53 -07:00
ThatOneCalculator
42ba2cf94a im stuff 2022-07-29 01:11:25 -07:00
ThatOneCalculator
cc89820db8 remove console log 2022-07-29 00:44:17 -07:00
ThatOneCalculator
d15a3c6dde console log 2022-07-29 00:40:27 -07:00
ThatOneCalculator
20608d9b55 stuff 2022-07-29 00:35:49 -07:00
ThatOneCalculator
e2db8dd230 brackets 2022-07-29 00:33:51 -07:00
ThatOneCalculator
7852e3ae4a () 2022-07-29 00:30:42 -07:00
ThatOneCalculator
e2d3d8a9d4 im stuff 2022-07-29 00:28:21 -07:00
ThatOneCalculator
acb27d13f5 try @Johann150's solution :) 2022-07-29 00:25:22 -07:00
ThatOneCalculator
f3ba1742b1 im stuff 2022-07-29 00:20:40 -07:00
ThatOneCalculator
8af503ec91 no quotes 2022-07-29 00:13:29 -07:00
ThatOneCalculator
92b914b581 testtt 2022-07-29 00:09:49 -07:00
ThatOneCalculator
cfe6f1b71c testtt 2022-07-29 00:00:39 -07:00
ThatOneCalculator
a13c978122 FROM clause 2022-07-28 23:57:18 -07:00
ThatOneCalculator
888038646f aaa 2022-07-28 23:53:42 -07:00
ThatOneCalculator
a6ec677cc3 fix!!!! 2022-07-28 23:46:36 -07:00
ThatOneCalculator
59c2927650 proper error 2022-07-28 23:01:13 -07:00
ThatOneCalculator
9aeffce5df bruh 2022-07-28 22:57:54 -07:00
ThatOneCalculator
962a5213f7 help i cant write queer ees :( 2022-07-28 22:54:59 -07:00
ThatOneCalculator
2fb389601a ack 2022-07-28 22:46:51 -07:00
ThatOneCalculator
d9f111bb31 test :( 2022-07-28 22:42:40 -07:00
ThatOneCalculator
cef356b7b8 typo!! 2022-07-28 22:31:49 -07:00
ThatOneCalculator
4dc7e746ce I think i fixed it! 2022-07-28 22:29:54 -07:00
ThatOneCalculator
978bf199a0 test 2022-07-28 22:17:59 -07:00
ThatOneCalculator
977f649f12 Calckey 2022-07-28 21:59:49 -07:00
ThatOneCalculator
01f1ad7de5 signs post icon for recommended 2022-07-28 21:58:25 -07:00
ThatOneCalculator
1e95004007 typo in file name 2022-07-28 21:50:00 -07:00
ThatOneCalculator
ba29733ea7 typo 2022-07-28 21:49:36 -07:00
ThatOneCalculator
23ac16e80f typo 2022-07-28 21:45:39 -07:00
ThatOneCalculator
6232f4d260 typo 2022-07-28 21:39:48 -07:00
ThatOneCalculator
43c4a95af2 typo 2022-07-28 21:36:38 -07:00
ThatOneCalculator
bcacfc0811 Recommended timeline! 2022-07-28 21:28:13 -07:00
ThatOneCalculator
ed03c5eb21 solid borders on qrns fix 2022-07-28 09:25:11 -07:00
ThatOneCalculator
6372357f81 Less cluttered notification summary 2022-07-28 09:24:43 -07:00
ThatOneCalculator
898f7a7021 im stufff 2022-07-27 21:36:02 -07:00
ThatOneCalculator
88955e5a23 A 2022-07-27 21:33:23 -07:00
ThatOneCalculator
3ac655d27e fix againnn 2022-07-27 21:31:05 -07:00
ThatOneCalculator
371f9cbb4f fix migration 2022-07-27 21:25:37 -07:00
ThatOneCalculator
5459f2f20d Fix migration 2022-07-27 21:22:03 -07:00
ThatOneCalculator
e657b80d91 adjust padding on icons only 2022-07-27 21:00:41 -07:00
ThatOneCalculator
fa979a6412 padding 2022-07-27 20:43:51 -07:00
Johann150
dc793c86f8 fix lints 2022-07-27 19:46:56 -07:00
Chloe Kudryavtsev
7459dc0819 backend: improve mutes and blocks 
Mutes and blocks now also apply recursively to replies and renotes.
Furthermore, any mentioned user being muted or blocked will also apply.
 2022-07-27 19:46:26 -07:00
ThatOneCalculator
144737feb4 rose pine code blocks 2022-07-27 19:32:21 -07:00
ThatOneCalculator
9d93329527 formatting 2022-07-27 19:31:33 -07:00
ThatOneCalculator
c6f9136ec8 loader stroke 6px 2022-07-27 19:27:29 -07:00
ThatOneCalculator
201655b595 Toggleable showing updates 2022-07-27 19:24:51 -07:00
ThatOneCalculator
8f04928d80 speed up to 1.2s 2022-07-27 12:34:23 -07:00
ThatOneCalculator
3d8ef2f9bc LOADING ANIMATION IS FINALLY FIXED 2022-07-27 12:32:14 -07:00
ThatOneCalculator
df7b3326b9 40 2022-07-27 12:28:36 -07:00
ThatOneCalculator
d26dba28a9 🙏 2022-07-27 12:27:09 -07:00
ThatOneCalculator
1fedfba14c fix fr on god no cap 2022-07-27 12:04:26 -07:00
ThatOneCalculator
e66818eb84 hopefully fix fo the last time 2022-07-27 11:57:09 -07:00
ThatOneCalculator
5bf254657a fix again 2022-07-27 11:52:10 -07:00
ThatOneCalculator
14c6e94e30 fix 2022-07-27 11:46:52 -07:00
ThatOneCalculator
f732867e87 accessibility <3 2022-07-27 11:32:55 -07:00
ThatOneCalculator
7c0a893086 more readable icons 2022-07-27 11:21:25 -07:00
ThatOneCalculator
7fb6383e53 Spinner 2022-07-27 11:19:57 -07:00
ThatOneCalculator
690b03979b Custom splash icons! 2022-07-27 10:25:30 -07:00
ThatOneCalculator
80fbe938b4 🎨 2022-07-27 10:07:52 -07:00
ThatOneCalculator
0ed6d30f5e Add endpoint 2022-07-27 09:58:18 -07:00
ThatOneCalculator
ed2ddd2cca clean up 2022-07-27 09:47:29 -07:00
ThatOneCalculator
3efd03800d Custom MOTD! 2022-07-27 09:46:35 -07:00
ThatOneCalculator
685b5c83af 🎨 2022-07-26 21:35:03 -07:00
ThatOneCalculator
cd4e9bbaee 🎨 2022-07-26 21:33:52 -07:00
ThatOneCalculator
03eedc2ea5 🎨 2022-07-26 21:32:03 -07:00
ThatOneCalculator
59fb6c0f17 More rpine 2022-07-26 21:18:36 -07:00
ThatOneCalculator
47265a6919 accesibility 2022-07-26 21:02:43 -07:00
ThatOneCalculator
995a330926 semi for children 2022-07-26 14:45:36 -07:00
ThatOneCalculator
2025e51051 Remove channels from actions 2022-07-26 14:40:11 -07:00
ThatOneCalculator
2e23f554aa onClick -> handler 2022-07-26 14:35:12 -07:00
ThatOneCalculator
8127cc7657 Remove updated.vue for now 2022-07-26 14:31:46 -07:00
ThatOneCalculator
9522b42dd2 Misc timeline actions as headerActions 2022-07-26 14:29:52 -07:00
ThatOneCalculator
be0bb66f69 revert 2022-07-26 13:16:49 -07:00
ThatOneCalculator
c82e8c9b31 test 2022-07-26 12:29:37 -07:00
ThatOneCalculator
5072c7de9e headerbar 2022-07-26 12:21:12 -07:00
ThatOneCalculator
df184a6725 hide federation from public local instance info if not mod 2022-07-25 21:21:40 -07:00
ThatOneCalculator
a8be587b94 Add back admin custom css start 2022-07-25 19:19:36 -07:00
ThatOneCalculator
f9003c5ee8 Start admin custom css 2022-07-25 19:18:56 -07:00
ThatOneCalculator
80fad13173 Add back missing routes 2022-07-25 19:17:47 -07:00
ThatOneCalculator
375231e457 Revert "Start admin custom css" 
This reverts commit 74b52213eec21e9ead7574cdfd1f8cc11022e000.
 2022-07-25 19:00:10 -07:00
ThatOneCalculator
928f1d68f0 More rpine 2022-07-25 18:15:01 -07:00
ThatOneCalculator
9c07d0f4cf more rpine 2022-07-25 18:15:01 -07:00
ThatOneCalculator
2cd1f82038 More rose pine stuff 2022-07-25 17:32:25 -07:00
ThatOneCalculator
1d900894c8 fix 2022-07-25 17:27:57 -07:00
ThatOneCalculator
525f81f218 Fix 2022-07-25 17:24:16 -07:00
ThatOneCalculator
7658f89dca Raw instance info only for moderators 2022-07-25 17:14:37 -07:00
ThatOneCalculator
b496e9c067 Start admin custom css 2022-07-25 17:00:44 -07:00
ThatOneCalculator
4d300a7055 profile as bg 2022-07-25 16:04:30 -07:00
ThatOneCalculator
2944d70379 fix 2022-07-25 14:17:58 -07:00
Johann150
071f893007 use getNote instead of Notes.find 
If a note is not visible to the requesting user, an error will be raised.
 2022-07-25 14:17:20 -07:00
ThatOneCalculator
c4b9f702b4 .js 2022-07-25 14:02:46 -07:00
ThatOneCalculator
a718f8d053 fix import 2022-07-25 13:59:12 -07:00
ThatOneCalculator
a75fe41f06 im stuff 2022-07-25 13:57:13 -07:00
ThatOneCalculator
735ad48874 FOUNDKEY changes 2022-07-25 13:50:52 -07:00
Johann150
43a42ea9ad refactor queue chart to composition API 2022-07-25 13:49:37 -07:00
ThatOneCalculator
25f95e89ae queeueueueu chart 2022-07-25 13:48:35 -07:00
Johann150
7d7cdeca6b refactor: colours in queue chart 2022-07-25 13:47:48 -07:00
Johann150
fc307d1916 FOUNDKEY changes 2022-07-25 13:45:00 -07:00
Johann150
8d5ec8662e Refactor components/page/page.textarea.vue to composition API 
https://akkoma.dev/FoundKeyGang/FoundKey/pulls/26
 2022-07-25 13:43:06 -07:00
Johann150
a020534140 Refactor components/page/page.text.vue to composition API 
https://akkoma.dev/FoundKeyGang/FoundKey/pulls/25
 2022-07-25 13:42:40 -07:00
ThatOneCalculator
2d856cb38e back to 30 2022-07-25 13:41:45 -07:00
Johann150
2c72acd813 enable to fetch replies recursively 2022-07-25 13:40:37 -07:00
Johann150
3f9788cae8 pack children without detail 2022-07-25 13:40:22 -07:00
Johann150
2832273e70 client uses new API for child notes depth 2022-07-25 13:40:01 -07:00
Johann150
2c814b317f remove ms dependency 2022-07-25 13:38:31 -07:00
Johann150
fed2085138 Merge: enhance privacy of notes 
https://akkoma.dev/FoundKeyGang/FoundKey/pulls/14
 2022-07-25 13:36:44 -07:00
Johann150
adcc3c9286 remove unnecessary joins 
These joins are no longer necessary as of commit
c35372a20d22cddb75e93a0b407f2b652cd7faf0. It seems they are bad enough
for performance to break installs.
 2022-07-25 13:28:57 -07:00
Johann150
0ea514c89f refactor pages/auth.form.vue to composition API 2022-07-25 13:27:35 -07:00
ThatOneCalculator
f556ec82b2 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-25 10:23:27 -07:00
syuilo
f26882f864 chore(client): tweak style 2022-07-25 21:24:37 +09:00
syuilo
465f3aae49 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-07-25 21:16:52 +09:00
syuilo
8c88abb126 add missing dependency 2022-07-25 21:16:46 +09:00
hayabusa
811f29cd90 一部のアプリからファイルを投稿フォームへドロップできない場合がある問題を修正 (#9035) 
* dropEffectとeffectAllowedの関連付けを修正

* Update Changelog

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 2022-07-25 21:16:11 +09:00
syuilo
a462544027 update deps 2022-07-25 21:10:06 +09:00
ThatOneCalculator
a0d98555df More #31748f 2022-07-24 18:36:55 -07:00
ThatOneCalculator
6ece6fb041 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-24 18:07:18 -07:00
syuilo
887290c8b1 chore(client): tweak ui 2022-07-24 18:44:50 +09:00
syuilo
3a8b93ac26 tweak rate limit 2022-07-24 17:56:48 +09:00
syuilo
1acf723f2c fix html 2022-07-24 17:09:46 +09:00
ThatOneCalculator
861b12cf9a Even more spacing 2022-07-24 00:00:24 -07:00
ThatOneCalculator
8a6d36f9c5 More padding 2022-07-23 23:54:54 -07:00
ThatOneCalculator
7b3f5d0300 Rose Pine sparkles 2022-07-23 23:48:00 -07:00
ThatOneCalculator
e758f4c0a2 Rose Pine danger color 2022-07-23 23:46:13 -07:00
syuilo
b6f1cf488b refactor(client): refactor components 2022-07-24 15:45:16 +09:00
syuilo
21b9fef5a5 chore(client): tweak style 2022-07-24 15:41:06 +09:00
ThatOneCalculator
3108ff4cec Item Spacing 2022-07-23 23:39:55 -07:00
ThatOneCalculator
c9657cd472 margin bottom for icon only 2022-07-23 23:30:25 -07:00
ThatOneCalculator
2907f82553 Clear up Ai mode 2022-07-23 23:29:01 -07:00
ThatOneCalculator
49b3109f2c ACTUALLY align, .b4 2022-07-23 23:17:44 -07:00
ThatOneCalculator
e330870e79 align instance icon on mobile 2022-07-23 23:13:18 -07:00
ThatOneCalculator
07f2261c70 New navbar for mobile 2022-07-23 23:05:20 -07:00
ThatOneCalculator
6fa6bc1915 🎨 2022-07-23 22:10:07 -07:00
ThatOneCalculator
3ff02c15b0 pf bg 2022-07-23 22:01:41 -07:00
ThatOneCalculator
e0cead53d7 start better headerbar 2022-07-23 21:57:13 -07:00
ThatOneCalculator
c894adc13c 🎨 2022-07-23 21:39:48 -07:00
ThatOneCalculator
7d91257317 Less cluttered notifications 2022-07-23 21:30:42 -07:00
ThatOneCalculator
8532c7eea5 more rpine stuff 2022-07-23 21:23:04 -07:00
ThatOneCalculator
266d79c122 More rpine stuff 2022-07-23 21:23:03 -07:00
ThatOneCalculator
3b80d3f348 More RPine 2022-07-23 21:16:35 -07:00
ThatOneCalculator
d8afd6e234 fix note button 2022-07-23 21:10:34 -07:00
ThatOneCalculator
d34c615105 fixxxx 2022-07-23 20:21:19 -07:00
ThatOneCalculator
86f7bd3b72 fix 2022-07-23 20:10:17 -07:00
ThatOneCalculator
9ce7413abe spacing in navbar 2022-07-23 20:06:26 -07:00
ThatOneCalculator
cc8accf5d5 showGap true 2022-07-23 20:04:13 -07:00
ThatOneCalculator
4ee8834993 fix style 2022-07-23 20:01:24 -07:00
ThatOneCalculator
27212f1433 finish up new navbar 2022-07-23 19:54:13 -07:00
ThatOneCalculator
36358ead1c More Rose Pine shtuff 2022-07-23 19:49:00 -07:00
ThatOneCalculator
47dac7ac1b MkLoading instead of "Loading..." 2022-07-23 19:45:27 -07:00
ThatOneCalculator
00bfafbb6e fix 2022-07-23 19:36:50 -07:00
ThatOneCalculator
44206e908e :imstuff: 2022-07-23 19:28:57 -07:00
ThatOneCalculator
c377d39380 Navbar test 2022-07-23 19:18:44 -07:00
ThatOneCalculator
d3752aad4a Mark as read from notifications widget 2022-07-23 19:10:05 -07:00
ThatOneCalculator
53e6fbfb89 Merge remote-tracking branch 'johann150/mk/bearer-authentication' into develop 2022-07-23 19:05:35 -07:00
ThatOneCalculator
2808f1b552 🥴 2022-07-23 18:58:35 -07:00
ThatOneCalculator
c54990b0e6 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-23 18:57:23 -07:00
dependabot[bot]
ed5ee682ba chore(deps): bump undici from 5.5.1 to 5.8.0 in /packages/backend (#9028) 
Bumps [undici](https://github.com/nodejs/undici) from 5.5.1 to 5.8.0.
- [Release notes](https://github.com/nodejs/undici/releases)
- [Commits](https://github.com/nodejs/undici/compare/v5.5.1...v5.8.0)

---
updated-dependencies:
- dependency-name: undici
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-23 14:41:01 +09:00
dependabot[bot]
c07d014275 chore(deps): bump file-type from 17.1.2 to 17.1.3 in /packages/backend (#9030) 
Bumps [file-type](https://github.com/sindresorhus/file-type) from 17.1.2 to 17.1.3.
- [Release notes](https://github.com/sindresorhus/file-type/releases)
- [Commits](https://github.com/sindresorhus/file-type/compare/v17.1.2...v17.1.3)

---
updated-dependencies:
- dependency-name: file-type
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-07-23 14:40:54 +09:00
syuilo
8a80246d24 lint fix 2022-07-23 14:31:54 +09:00
syuilo
0549e62e3a update tfjs 2022-07-23 14:31:15 +09:00
Kainoa Kanter
088fef7c39 fix: broken chats (#8983) 
* Fix broken chats

Co-authored-by: @ltlapy

* 🎨
 2022-07-23 00:46:52 +09:00
ThatOneCalculator
80ae73f543 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-21 23:43:30 -07:00
xianon
fed327b437 リモートユーザーを正しくブロックできるように修正する (#9027) 2022-07-22 15:41:31 +09:00
ThatOneCalculator
e7eee6a9d8 b3 2022-07-21 12:48:23 -07:00
syuilo
3478b4392e enhance(client): add some themes 2022-07-22 00:25:56 +09:00
syuilo
815f962ff4 fix(client): MiAuth page is broken 
Fix #9026
 2022-07-22 00:17:52 +09:00
syuilo
b374c4dcf6 chore: improve error message of boot 2022-07-21 22:30:36 +09:00
syuilo
33c1d2f57d fix(client): fix drawer menu style regression 2022-07-21 22:22:13 +09:00
ThatOneCalculator
2e00d82d29 Merge remote-tracking branch 'misskey/develop' into develop 2022-07-20 22:04:12 -07:00
Johann150
8c641f0fbd fix: not logged in clients send correct header 2022-07-20 18:41:07 +02:00
syuilo
2d28c2bedd fix(client): some fixes 2022-07-21 00:32:41 +09:00
syuilo
d0b5ab669b fix(client): fix some routings 2022-07-20 23:21:42 +09:00
syuilo
d41f1f7fee chore(client): tweak theme select ui 2022-07-20 23:02:14 +09:00
syuilo
ae853e8830 fix(client): support v-if of select component 2022-07-20 23:01:40 +09:00
syuilo
ae766b0708 refactor(client): ✨ 2022-07-20 22:24:26 +09:00
syuilo
c5bfac04ae fix(client): タイミングによっては tag-cloud でエラーが発生するのを修正 2022-07-20 20:00:35 +09:00
syuilo
c5710094c0 chore(client): tweak radio component 2022-07-20 19:59:50 +09:00
syuilo
711322cd9a enhance(client): ネストしたルーティングに対応 2022-07-20 19:59:27 +09:00
ThatOneCalculator
e4139b7ac1 fix search 2022-07-19 21:53:08 -07:00
ThatOneCalculator
51533f35d7 Option to fully disable connection lost 2022-07-19 20:15:08 -07:00
ThatOneCalculator
ce490420e3 0.1 for small 2022-07-19 19:56:37 -07:00
ThatOneCalculator
a0e74cf501 mob nav 2022-07-19 16:56:23 -07:00
ThatOneCalculator
54a011530f revert change pos 2022-07-19 16:51:37 -07:00
ThatOneCalculator
31da3c16c3 Properly apply star is like patch 2022-07-19 15:23:26 -07:00
ThatOneCalculator
3556dfccb0 Renewed navbar 2022-07-19 15:14:37 -07:00
ThatOneCalculator
5f38fc1891 Calckey in about 2022-07-19 12:31:24 -07:00