Commit Graph

4146 Commits

Author SHA1 Message Date
Freeplay
4fb9b0bbf7 hide broken logged-out header link for now 2023-05-31 19:43:58 -04:00
Freeplay
80d23791fb fix 2023-05-31 19:35:02 -04:00
naskya
a4b5726ecc format 2023-06-01 08:01:24 +09:00
naskya
8c6f98cfc3 Fix exported settings being not importable 2023-06-01 07:55:59 +09:00
naskya
6e09a56c2d no change, but more comfortable 2023-06-01 07:29:54 +09:00
naskya
0c9b101479 switch position of social and recommended 2023-06-01 07:24:49 +09:00
Freeplay
e492a581b3 lemme just update that 2023-05-31 17:59:03 -04:00
Freeplay
9f2fb71ec0 Fix #10236 2023-05-31 17:02:58 -04:00
Freeplay
867c4cf0d7 fix 2023-05-31 16:41:31 -04:00
Freeplay
87967b5662 button styling 2023-05-31 16:34:29 -04:00
Kainoa Kanter
f56136f680 Merge pull request '[PR]: enhance: multiple alsoKnownAs' (#10232) from nmkj/calckey:more-aka into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10232
2023-05-31 19:10:25 +00:00
Kainoa Kanter
aac24553d5 Merge pull request 'Less WS logging + use logger for meilisearch' (#10234) from PrivateGER/calckey:fix/remove-console-logs into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10234
2023-05-31 19:08:36 +00:00
ThatOneCalculator
664454f2e2 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-31 12:06:34 -07:00
ThatOneCalculator
6013a0b309 chore: ⬆️ up bull 2023-05-31 12:06:26 -07:00
PrivateGER
badbecfe60 Less logging of every single WS message + use logger in Meilisearch 2023-05-31 12:08:21 +02:00
Namekuji
34596dd0f7 remove empty form input 2023-05-31 01:14:13 -04:00
Namekuji
853940c5d6 use parse instead 2023-05-31 01:02:41 -04:00
Namekuji
6e4d6d48c4 get array for alsoKnownAs 2023-05-31 01:02:22 -04:00
PrivateGER
5ebd4ff4be Add english and japanese stop words to Meili database 2023-05-30 23:11:10 +02:00
Freeplay
172b37fe00 fix border w/ wallpaper 2023-05-30 10:15:18 -04:00
ThatOneCalculator
4afe6d23ea Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-29 19:46:21 -07:00
ThatOneCalculator
fa215bf777 Revert "refactor: add back old info display from mkv12"
This reverts commit c58692fa5861afba772b77ff243fda67af4bb6ce.
2023-05-29 19:45:42 -07:00
Freeplay
4993e4b43a Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-05-29 22:41:09 -04:00
Freeplay
d6ae979011 swiper tweak 2023-05-29 22:40:53 -04:00
ThatOneCalculator
d91a49e966 fix 2023-05-29 19:34:32 -07:00
ThatOneCalculator
354a3d9fa9 up redis deps 2023-05-29 19:32:33 -07:00
ThatOneCalculator
578d023d32 chore: up bull-board deps 2023-05-29 19:30:20 -07:00
ThatOneCalculator
b62fc51121 refactor: add back old info display from mkv12 2023-05-29 16:13:36 -07:00
ThatOneCalculator
b6918574dc Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-29 15:40:18 -07:00
ThatOneCalculator
161927d0e8 margin 2023-05-29 15:40:02 -07:00
Freeplay
ddb7f63f8e Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-05-29 18:29:55 -04:00
Freeplay
8932099c45 fix close button pos in compose box 2023-05-29 18:29:42 -04:00
ThatOneCalculator
8a0e3ecfa1 fix query 2023-05-29 15:21:29 -07:00
ThatOneCalculator
bf48923be7 feat: server metrics in admin overview 2023-05-29 15:10:25 -07:00
ThatOneCalculator
0f2aecdf59 style: 💄 server metrics widgets 2023-05-29 15:10:14 -07:00
ThatOneCalculator
71a78a9305 refactor: ⚰️ remove old metrics view 2023-05-29 13:49:38 -07:00
ThatOneCalculator
8dda62f953 chore: formatting 2023-05-29 13:17:42 -07:00
ThatOneCalculator
08f31cce4c fix: server info widget images 2023-05-29 13:16:41 -07:00
ThatOneCalculator
5d9ffe86ec add tooltip to meili pie chart 2023-05-29 13:03:47 -07:00
ThatOneCalculator
1dc2a34537 remove repetitive errors in groups 2023-05-29 12:52:43 -07:00
ThatOneCalculator
b00d1afe9d dev33 2023-05-29 12:28:58 -07:00
Freeplay
6843ee409f forgot to give aria to close button o o p s 2023-05-29 15:19:53 -04:00
Kainoa Kanter
78c493f82c Merge pull request 'Add hints for clips, antennas, lists, and timelines' (#10226) from Freeplay/calckey:hints into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10226
2023-05-29 19:16:56 +00:00
ThatOneCalculator
cc77c6c175 locales 2023-05-29 12:16:35 -07:00
Freeplay
7def5ce16c Add lists hint 2023-05-29 15:08:33 -04:00
Freeplay
db6f0686b9 closeable prop 2023-05-29 14:55:00 -04:00
Freeplay
a15c8d782a Add timeline hints 2023-05-29 14:51:02 -04:00
PrivateGER
91970a2fc6 formatter 2023-05-29 20:09:52 +02:00
PrivateGER
7ef78fcd12 Make Meilisearch optional and don't connect if unconfigured 2023-05-29 19:46:38 +02:00
ThatOneCalculator
cef16a1250 formatting 2023-05-29 10:19:13 -07:00
ThatOneCalculator
e761bd6b23 fixes 2023-05-29 10:18:12 -07:00
Freeplay
6c8dd6d7f0 always show antennas hint at top 2023-05-29 13:10:35 -04:00
ThatOneCalculator
0c9e12c340 chore: format 2023-05-29 10:01:34 -07:00
ThatOneCalculator
68b8b5b4ab Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-29 10:00:25 -07:00
ThatOneCalculator
8d363898d4 revert #10222 2023-05-29 10:00:16 -07:00
Freeplay
44fc41ce9b Merge branch 'develop' of https://codeberg.org/calckey/calckey into hints 2023-05-29 12:47:15 -04:00
Kainoa Kanter
21583291bf Merge pull request 'Delete deleted posts from Meilisearch' (#10223) from PrivateGER/calckey:feat/delete-posts-from-meili into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10223
2023-05-29 16:42:57 +00:00
PrivateGER
51160a6a77 Delete deleted posts from Meilisearch 2023-05-29 18:33:57 +02:00
ThatOneCalculator
31a593d45b dev31 2023-05-29 09:32:55 -07:00
ThatOneCalculator
aaa2041d38 chore: format 2023-05-29 09:31:02 -07:00
PrivateGER
b8bd07e3c4 Only connect to Meili with valid config 2023-05-29 17:36:03 +02:00
Freeplay
66c4e8ed76 Move follow button + always show label 2023-05-29 09:40:00 -04:00
Freeplay
ca8d63c2b0 Add clips, antennas hint 2023-05-29 09:11:42 -04:00
Kainoa Kanter
c6adc39792 Merge pull request 'fix: deprecate AID and enforce Cuid2' (#10216) from nmkj/calckey:deprecate-aid into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10216
2023-05-29 04:12:15 +00:00
ThatOneCalculator
916716b589 properly calculate percent 2023-05-28 21:10:21 -07:00
ThatOneCalculator
fab56443ef chore: 💡 meili 2023-05-28 21:04:54 -07:00
ThatOneCalculator
24f4348868 fix 2023-05-28 20:59:36 -07:00
ThatOneCalculator
c4418590bc fix 2023-05-28 20:47:22 -07:00
ThatOneCalculator
8dc133ada2 add pie chart to meili stats 2023-05-28 20:37:53 -07:00
ThatOneCalculator
62835aa4a3 chore: formatting 2023-05-28 20:34:18 -07:00
Kainoa Kanter
43f5cdbcc9 Merge pull request 'MeiliSearch Integration' (#10204) from PrivateGER/calckey:feat/meilisearch-integration into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10204
2023-05-29 03:31:38 +00:00
ThatOneCalculator
5a8dfbb8fd feat: server info widget
Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
2023-05-28 20:14:08 -07:00
Namekuji
399b0e96dc use cuid2 with timestamp 2023-05-28 22:16:42 -04:00
Freeplay
02f2470791 add channel federation warn 2023-05-28 20:31:00 -04:00
Freeplay
0741df711a fix: move isRenote check to note.vue 2023-05-28 20:20:53 -04:00
TalonTheDragon
77b1ecc1a0 Merge branch 'more-accessibility' into fix/more-accessibility 2023-05-29 01:49:44 +02:00
TalonTheDragon
99967b58e3 Add labels to dialog OK and Close buttons 2023-05-29 01:48:24 +02:00
Free
27307a8de2 revert 18156487d91bb2c7d4ba5588da37ab1f1e84350e
revert fix: move isRenote check to note.vue
2023-05-28 23:17:10 +00:00
Freeplay
306f629ca5 fix: move isRenote check to note.vue 2023-05-28 19:14:01 -04:00
Kainoa Kanter
73cccc2e2b Merge pull request 'New media list layout + hide controls when player too small' (#10213) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10213
2023-05-28 21:24:45 +00:00
Freeplay
cb3eedaf70 fix position 2023-05-28 16:21:00 -04:00
Freeplay
a72dc74f3f fix 2023-05-28 15:25:57 -04:00
Freeplay
32703cd06d fix 2023-05-28 14:35:05 -04:00
Freeplay
96f5795673 Hide video controls if player too small 2023-05-28 13:57:25 -04:00
ikiko
e4b0f0d15b Merge branch 'develop' into feat-mfm-crop 2023-05-28 17:33:23 +00:00
Isabell
3b5a680fdf fix: MFM crop percentage parsing 2023-05-29 03:31:06 +10:00
Kainoa Kanter
7d016ab9f4 Merge pull request 'Feat: add MFM crop content' (#10211) from ikiko/calckey:feat-mfm-crop into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10211
2023-05-28 16:34:18 +00:00
Kainoa Kanter
24671091c3 Merge pull request 'Use ph-lock for followers-only visibility' (#10210) from naskya/calckey:ph-lock into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10210
2023-05-28 16:31:29 +00:00
Freeplay
053f5c9c8b tweak 2023-05-28 10:53:45 -04:00
Isabell
62fce3a32e add ability to crop content 2023-05-28 15:19:57 +10:00
Freeplay
4b12973586 Add bottom fade to show less & hide buttons 2023-05-28 00:17:23 -04:00
Freeplay
001d6f6d20 new media list layout 2023-05-27 23:24:38 -04:00
PrivateGER
a1f1b74802 use correct stats property 2023-05-28 03:05:32 +02:00
PrivateGER
01ce43e6ad Fix Meilisearch widget reactivity 2023-05-28 02:58:20 +02:00
PrivateGER
40b9f87bef add advanced search parameters in search popup 2023-05-28 00:27:16 +00:00
PrivateGER
282fdf347a Implement follower and following searches 2023-05-28 00:27:16 +00:00
PrivateGER
0a2c9a6c27 add semicolon after property 2023-05-28 00:27:16 +00:00
PrivateGER
40ad37b870 Default meilisearch data response + linting + prettyfier 2023-05-28 00:27:16 +00:00
PrivateGER
bd2ece3a01 i18n strings 2023-05-28 00:27:16 +00:00
PrivateGER
182aaf7a57 Pin meilisearch library 2023-05-28 00:27:16 +00:00
PrivateGER
aa6d3c3b74 Remove stray newline 2023-05-28 00:27:16 +00:00
PrivateGER
591639e570 Add ssl option to MeiliSearch config 2023-05-28 00:27:16 +00:00
PrivateGER
2f20cf476b Lint + formatting 2023-05-28 00:27:16 +00:00
PrivateGER
a8a88af73b Remove indexing logger 2023-05-28 00:27:16 +00:00
PrivateGER
35b9245dc4 Correct logging statement + add missing returns 2023-05-28 00:27:16 +00:00
PrivateGER
de3089937d .filter isn't in-place, now reassigning correctly 2023-05-28 00:27:16 +00:00
PrivateGER
85403efe4e Actually assign user object to note 2023-05-28 00:27:16 +00:00
PrivateGER
f5aa0c86cf Load relationships to populate user fields 2023-05-28 00:27:16 +00:00
PrivateGER
e23ca84925 Add parsing of host, fix usernames 2023-05-28 00:27:16 +00:00
PrivateGER
6c7cf90c5b Specify primary key 2023-05-28 00:27:16 +00:00
PrivateGER
755ab39ba0 Fix import 2023-05-28 00:27:16 +00:00
PrivateGER
206f7bfc09 Add high performance batch imports 2023-05-28 00:27:16 +00:00
PrivateGER
07ef4b5ed1 Add search operators to frontend 2023-05-28 00:27:16 +00:00
PrivateGER
243b4fb60b Adjust search term logging + use filtered search query 2023-05-28 00:27:16 +00:00
PrivateGER
44478db3e6 Add createdAt column, fix username filtering, filter advanced search terms correctly 2023-05-28 00:27:16 +00:00
PrivateGER
8edac3c654 Add basic advanced search + attachment metadata hints 2023-05-28 00:27:16 +00:00
PrivateGER
4cf7089e9d remove extra header 2023-05-28 00:27:16 +00:00
PrivateGER
d12e58a038 Import .js files 2023-05-28 00:27:16 +00:00
PrivateGER
2abf027d33 Fix property names 2023-05-28 00:27:16 +00:00
PrivateGER
55ce94b951 Add Meilisearch widget 2023-05-28 00:27:16 +00:00
PrivateGER
090b5724b4 Fix wrong parameter ordering 2023-05-28 00:27:16 +00:00
PrivateGER
99b4e5e13c Implement Meilisearch Indexing 2023-05-28 00:27:16 +00:00
Freeplay
9e0e305aef fix 2023-05-27 18:38:27 -04:00
naskya
1122827980 use ph-lock for followers visibility 2023-05-28 03:10:15 +09:00
Freeplay
a9a09b3635 Fix hide button being not clickable 2023-05-27 11:00:10 -04:00
Freeplay
ee6da4dd22 Don't show unlisted posts in antennas 2023-05-26 20:05:26 -04:00
TalonTheDragon
a9e5101d12 Add labels to chat form 2023-05-26 23:43:35 +02:00
TalonTheDragon
495df8efe4 Do the same for the typing list 2023-05-26 23:38:38 +02:00
TalonTheDragon
748ab9e2ac Add aria live region to message list so they get read automatically as they come in 2023-05-26 23:30:27 +02:00
Freeplay
8387d7e4ac maybe fix blurry text in swiper ? 2023-05-26 17:02:17 -04:00
Kainoa Kanter
fdf2cb6d23 hotfix: try catch hasUnreadAntenna 2023-05-26 16:32:59 +00:00
Freeplay
fdd299f5dd fix font size 2023-05-26 09:13:13 -04:00
ThatOneCalculator
aa3991f335 locale 2023-05-25 22:24:46 -07:00
ThatOneCalculator
3f1aeda46c Revert "chore: rebase to v13 MkFolder"
This reverts commit 8783cf0adfc7018ac1053d0ec1cd5df1517229ca.
2023-05-25 22:17:19 -07:00
ThatOneCalculator
494a0a8e92 refactor: make post imports an experiment 2023-05-25 22:05:43 -07:00
ThatOneCalculator
ee3bcff0d3 chore: rebase to v13 MkFolder
Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
2023-05-25 21:46:45 -07:00
ThatOneCalculator
3a9bfc8d20 chore: format 2023-05-25 20:42:14 -07:00
Kainoa Kanter
cec6e144e9 Merge pull request 'fix: weird styling of reaction counts' (#10203) from naskya/calckey:fix/no-emoji-reaction-count-styling into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10203
2023-05-26 03:33:39 +00:00
naskya
66c57e6b41 fix style 2023-05-26 12:28:31 +09:00
Kainoa Kanter
2637ccf1e8 Merge pull request 'Fix reply and quote icons' (#10202) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10202
2023-05-26 03:16:52 +00:00
ThatOneCalculator
ca45d42e36 fix: 💄 margin on expand tweet button 2023-05-25 20:05:19 -07:00
Freeplay
b2d916963d Fix reply and quote icons
past me was really dumb wth
2023-05-25 22:51:55 -04:00
ThatOneCalculator
0a45449108 chore: formatting 2023-05-25 19:47:10 -07:00
Freeplay
29d324bae2 fix z-index 2023-05-25 21:27:51 -04:00
Freeplay
d08e9575ac make consistent 2023-05-25 19:42:42 -04:00
Freeplay
310cdf0da2 apply properties to all swipers 2023-05-25 19:40:47 -04:00
Freeplay
22ed3f47a6 Only load timeline in active slide 2023-05-25 19:32:56 -04:00
Kainoa Kanter
609aa0aa6a Merge pull request 'Fix polls & own reactions not showing in replies' (#10199) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10199
2023-05-25 20:50:57 +00:00
Freeplay
4a7f447db4 tweak 2023-05-25 16:24:31 -04:00
Freeplay
72892dbee7 fix z-index 2023-05-25 15:50:14 -04:00
Freeplay
d9c8c7af98 Fix polls & own reactions not showing in replies 2023-05-25 15:49:39 -04:00
Kainoa Kanter
43c6dfbdfb Merge pull request 'Display author's replies first, fixes, other stuff' (#10194) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10194
2023-05-25 03:51:34 +00:00
Freeplay
8a218caec9 hide follow-button label on mobile 2023-05-24 21:41:28 -04:00
Freeplay
aa8affb2ad a 2023-05-24 21:33:49 -04:00
Freeplay
75cb5e18c6 little refactor 2023-05-24 19:33:59 -04:00
Freeplay
8cd812db83 Display replies by same author first 2023-05-24 17:40:16 -04:00
Essem
a974ce73ce Hide security key section if TOTP is disabled
This should prevent some unintended behavior (and 500 errors) for now.
2023-05-24 14:43:22 -05:00
April John
5e2adc9ad8 update inbox import timeout 2023-05-24 21:03:37 +02:00
April John
6f4465aa32 update post import 2023-05-24 20:22:16 +02:00
Freeplay
0fc9ddfe0c Add 'View on remote server' to right click menu 2023-05-24 14:00:18 -04:00
Freeplay
0170407833 Fix 'noteOf' text in post title 2023-05-24 13:22:53 -04:00
Freeplay
0e789ea1f9 Fix truncated text in header 2023-05-24 12:27:12 -04:00
Freeplay
65438fae1f overflow hidden to clip 2023-05-23 22:09:24 -04:00
Freeplay
28e62714d7 fix 2023-05-23 21:48:54 -04:00
Freeplay
d2e3e4d970 Change note right click menu to link context menu 2023-05-23 21:33:18 -04:00
ThatOneCalculator
417d73f771 make tosUrl open action in case it's external 2023-05-23 18:23:06 -07:00
ThatOneCalculator
3689cf8f61 feat: 👔 add link to TOS in info icon
Address #10117
2023-05-23 18:16:54 -07:00
ThatOneCalculator
5baa0053c3 chore: formatting 2023-05-23 18:02:52 -07:00
ThatOneCalculator
5cd67283f0 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-23 18:01:50 -07:00
ThatOneCalculator
c4d490c8da Merge branches 'develop' and 'develop' of codeberg.org:calckey/calckey into develop 2023-05-23 18:00:10 -07:00
ThatOneCalculator
5e8b7b1fd3 webhooks icon 2023-05-23 17:59:58 -07:00
Freeplay
1f467b2d8d hide scrollbar in header 2023-05-23 20:54:28 -04:00
Freeplay
6c039007e5 fix 2023-05-23 20:49:56 -04:00
Freeplay
b417793c31 Fix z-index, better clipping in notes 2023-05-23 20:30:55 -04:00
Freeplay
d3bf1778e4 Fix tabs not transitioning on first click 2023-05-23 13:56:29 -04:00
Kainoa Kanter
5054d6a565 Merge pull request 'Add some labels to & truncate notifications' (#10181) from Freeplay/calckey:notifications into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10181
2023-05-23 05:33:54 +00:00
naskya
b560145259 Format 2023-05-23 14:11:03 +09:00
naskya
c6d10e705a .js 2023-05-23 14:07:35 +09:00
MeiMei
54eb8f613b fix: Escape SQL LIKE
* SQL LIKE escape
2023-05-23 13:56:16 +09:00
ThatOneCalculator
7c02a6a5dd fix edit icon 2023-05-22 18:42:47 -07:00
Freeplay
d8ca299a07 Match notification padding to note's padding 2023-05-22 21:26:52 -04:00
Freeplay
8a6cc3edc4 fix rogue :global() (would prevent text in toggles from wrapping) 2023-05-22 21:16:55 -04:00
Freeplay
e9b86badda Merge branch 'develop' of https://codeberg.org/calckey/calckey into notifications 2023-05-22 21:12:11 -04:00
Freeplay
416850f4c1 Add labels to some & truncate notifications 2023-05-22 21:11:35 -04:00
Natty
6a4ce60241 Renote button optimization 2023-05-22 17:54:44 -07:00
ThatOneCalculator
cdad46d8f0 why was that ever there?? 2023-05-22 17:36:19 -07:00
ThatOneCalculator
3592953106 fix fade 2023-05-22 17:26:27 -07:00
ThatOneCalculator
5f27c462bb chore: formatting 2023-05-22 17:00:50 -07:00
ThatOneCalculator
2a0b1e1ef4 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-22 16:59:48 -07:00
ThatOneCalculator
216c754e98 Close #10177 2023-05-22 16:59:38 -07:00
Kainoa Kanter
8052f7c5a1 Merge pull request 'Center header tabs, only hide labels if more than 3' (#10178) from Freeplay/calckey:header into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10178
2023-05-22 23:48:01 +00:00
Freeplay
beec4e04ec padding fix 2023-05-22 19:40:38 -04:00
Kainoa Kanter
90f2a73ac4 Merge pull request 'Feat: MFM fade' (#10179) from ikiko/calckey:Feat-MFM-fade-dev into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10179
2023-05-22 21:48:03 +00:00
Isabell
b770f88ef7 clean up rebase 2023-05-23 07:08:58 +10:00
Isabell
26c89afaef add fade to MFM options 2023-05-23 07:01:10 +10:00
Isabell
40a41c20da add fade to cheat sheet 2023-05-23 06:59:33 +10:00
Isabell
1af8f838bd Add MFM fade functionality 2023-05-23 06:54:42 +10:00
Freeplay
2bc8933c85 this took longer than i would have liked. 2023-05-22 16:38:11 -04:00
Freeplay
3d58e5b222 fix avatar pos 2023-05-22 15:45:39 -04:00
Freeplay
78da441652 add ::before & ::after to themeChanging class 2023-05-22 15:40:36 -04:00
Freeplay
7d346f10c9 more fix, actually 2023-05-22 15:35:03 -04:00
Freeplay
25fee1156b better way of doing that
Couldn't due before becuase of how css was done
2023-05-22 15:23:26 -04:00
Freeplay
6aea2acf1b fixes!! 2023-05-22 15:20:05 -04:00
Kainoa Kanter
d2041db91f Nyanize non[consonant]
🟨🟪

https://calckey.social/notes/9f2l6x5u8e
2023-05-22 15:57:56 +00:00
Freeplay
b0fa7ba1ec Merge branch 'develop' of https://codeberg.org/calckey/calckey into header 2023-05-22 11:44:08 -04:00
ThatOneCalculator
d0bc891e2d chore: formatting 2023-05-22 08:23:00 -07:00
ThatOneCalculator
17435cadb2 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-22 08:22:31 -07:00
ThatOneCalculator
ed12633d44 chore: upgrade swiper 2023-05-22 08:22:21 -07:00
Kainoa Kanter
8dc7486003 Merge pull request 'Fix: Accessibility fixes, mostly for screen reader' (#10173) from TalonTheDragon/calckey:fix/accessibility into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10173
2023-05-22 14:51:51 +00:00
TalonTheDragon
116722a231 Set postIsExpanded to ref() for reactivity 2023-05-22 13:08:32 +02:00
Freeplay
8852bad167 fix 2023-05-22 06:26:17 -04:00
Freeplay
065e9e3b20 Hide icons in note tabs, always show reply tab 2023-05-22 06:21:41 -04:00
TalonTheDragon
a0701fada7 Emit event when cw is expanded 2023-05-22 12:18:17 +02:00
TalonTheDragon
670d9ed4d3 Add translation to content warning in MKNote.vue 2023-05-22 10:56:42 +02:00
TalonTheDragon
9a3e855640 Add translations to deck.vue aria labels 2023-05-22 10:54:42 +02:00
ThatOneCalculator
3a4b16b70b chore: up mfm-js in backend 2023-05-21 21:39:20 -07:00
ThatOneCalculator
8da250059d don't show underline if no tabs 2023-05-21 20:19:41 -07:00
ThatOneCalculator
b71643839c Close #10175 2023-05-21 20:07:25 -07:00
ThatOneCalculator
e807eff7bb chore: formatting 2023-05-21 20:05:52 -07:00
ThatOneCalculator
e3076c2eb9 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-21 20:05:36 -07:00
ThatOneCalculator
fb1b773480 Close #10174 2023-05-21 20:04:59 -07:00
Kainoa Kanter
b30288555a Merge pull request 'Tweak note tabs + add follow button to header + other minor stuff' (#10172) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10172
2023-05-22 01:08:21 +00:00
Freeplay
2c5762185e Give article semantic to subnote 2023-05-21 18:23:17 -04:00
TalonTheDragon
d7f751a1a0 Add translation to aria labels 2023-05-21 23:02:22 +02:00
Freeplay
dee942330d padding fix 2023-05-21 16:48:25 -04:00
Freeplay
1f01910f74 Add follow button to header 2023-05-21 16:30:35 -04:00
TalonTheDragon
339c0705c0 Accessible label in MKNote should be a computed value. Also Fixes renoted note labels 2023-05-21 21:57:29 +02:00
Freeplay
20556ad3b1 Set minimum size for buttons 2023-05-21 14:11:45 -04:00
TalonTheDragon
b8f90e192b Label deck and universal bar buttons for screen readers on mobile. Still needs translation and aria-selected 2023-05-21 19:17:13 +02:00
Freeplay
a39cc89ac7 Accessible follow button 2023-05-21 13:10:27 -04:00
TalonTheDragon
02a6a933cf Properly set aria-hidden on note content only if CW is present and show content has not been clicked 2023-05-21 16:12:13 +02:00
TalonTheDragon
029d12f8ca Add aria-label to note container. This makes screen-readers read out the content while navigating with the keyboard. 2023-05-21 16:10:48 +02:00
Freeplay
a4573c6639 tab fix 2023-05-20 21:46:33 -04:00
Freeplay
795c76f154 hide empty tabs 2023-05-20 21:20:17 -04:00
Freeplay
29eebcfe01 'Jump to Reply' to 'Jump to previous' 2023-05-20 16:42:06 -04:00
naskya
4d87266d13 files may be undefined 2023-05-21 05:34:39 +09:00
Freeplay
ef43af496c add back icons 2023-05-20 12:34:04 -04:00
Freeplay
fcaf71b120 Change detailed note tabs design 2023-05-20 12:08:20 -04:00
ThatOneCalculator
19aeaec4ce fix import 2023-05-19 23:59:49 -07:00
ThatOneCalculator
c470196e6d standardize post buttons 2023-05-19 23:38:36 -07:00
ThatOneCalculator
3f414d5921 chore: formatting 2023-05-19 23:27:56 -07:00
ThatOneCalculator
7e7357bae8 forgot } 2023-05-19 23:26:01 -07:00
ThatOneCalculator
3196163178 simpler fix, thank you @wikiyu 2023-05-19 23:22:10 -07:00
ThatOneCalculator
b728c7f722 Revert "fix api doc?"
This reverts commit 9e366dc563d376680f277db0d323fb5aa60e5c24.
2023-05-19 23:21:00 -07:00
ThatOneCalculator
ec29e55e62 fix api doc? 2023-05-19 23:14:59 -07:00
ThatOneCalculator
95ca9701e9 fix: show follow requests even if not locked 2023-05-19 22:52:14 -07:00
Kainoa Kanter
ca686382b9 Merge pull request 'Add reactions tab to detailed notes view' (#10161) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10161
2023-05-20 04:57:44 +00:00
Freeplay
08a70fd490 bottom padding 2023-05-20 00:53:15 -04:00
Freeplay
dfdd7520dd fix 2023-05-20 00:41:42 -04:00
Freeplay
5a6dbc1ba3 Reactions tab 2023-05-20 00:14:14 -04:00
Freeplay
41cd8f8523 fix depth 2023-05-19 23:02:15 -04:00
Namekuji
53a8e3ffc2 enhance: emoji width and height 2023-05-19 22:26:13 -04:00
Kainoa Kanter
897a8919ef chore: formatting 2023-05-19 15:41:59 -07:00
Kainoa Kanter
ad0ef2911c Note tabs + Jump to Reply changes + other stuff (#10157) 2023-05-19 21:20:15 +00:00
Freeplay
5a9a4e7435 fix null error 2023-05-19 17:07:22 -04:00
Freeplay
501b39e492 note metadata 2023-05-19 16:29:16 -04:00
Freeplay
46f25c34b5 Make UserCardMini clickable 2023-05-19 14:45:29 -04:00
Freeplay
e10f7431f3 fix loading icon for boosts tab 2023-05-19 14:40:47 -04:00
Freeplay
595e77493e mini mfm button 2023-05-19 14:34:16 -04:00
Freeplay
848739ed84 add withChart prop to UserCardMini 2023-05-19 14:28:36 -04:00
Freeplay
b7c83e0725 little bit more accessible tabs 2023-05-19 13:20:48 -04:00
Freeplay
a6094039c5 Tabbed content in detailed notes page 2023-05-19 13:02:41 -04:00
Freeplay
a5d81aafea simplify conversation code 2023-05-18 15:48:36 -04:00
Freeplay
f3931c9087 revert history api 2023-05-18 11:48:45 -04:00
naskya
35c8dbcfca format 2023-05-18 20:50:24 +09:00
naskya
490ede7caa Check alt text on mutes 2023-05-18 20:38:33 +09:00
Kainoa Kanter
9eba7f4962 Merge pull request 'More focusable elements + allow closing modal's w/ browser back & esc' (#10142) from Freeplay/calckey:keyboard into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10142
2023-05-18 05:43:55 +00:00
Freeplay
dc377c9263 Jump to Reply + other note page improvmeents 2023-05-17 21:54:37 -04:00
Freeplay
781ee172fe Display account info of post rather than 'Post' in header 2023-05-17 18:56:03 -04:00
Freeplay
7d7b5083e5 (actually) fix clicking audio opening post 2023-05-17 16:44:06 -04:00
Freeplay
234388957e SubNoteContent fixes 2023-05-17 15:24:51 -04:00
Freeplay
2aff0fc6fe Allow pressing esc to close lightbox 2023-05-17 13:46:00 -04:00
Freeplay
663c1839bf add touch events for tooltip on range input 2023-05-17 12:53:00 -04:00
Freeplay
f43eeb65b7 Close modals on browser back 2023-05-17 12:34:45 -04:00
Freeplay
c1cbea5580 There seemed to be no use for that ? 2023-05-17 00:10:24 -04:00
Kainoa Kanter
d2106d4904 fix: dont show cheat sheet when not needed 2023-05-16 20:31:13 -07:00
Freeplay
9b5a7000ab focus to elements 2023-05-16 22:40:02 -04:00
Kainoa Kanter
4030ce9643 rm unessicary option 2023-05-16 19:31:18 -07:00
Kainoa Kanter
a57da51d9f Merge pull request 'Add loading spinners to detailed note page & popups(if slow)' (#10139) from Freeplay/calckey:loaders into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10139
2023-05-17 01:39:50 +00:00
Freeplay
d3d5976614 Display waiting dialog if component takes more than a second to load 2023-05-16 19:28:07 -04:00
Freeplay
860757f1d3 Add loading spinners + remove unused 2023-05-16 18:18:07 -04:00
April John
5752cdb742 feat: allow horizontal scaling 2023-05-17 00:08:33 +02:00
Kainoa Kanter
4070b099cf Merge pull request 'Accessible Form Inputs!' (#10130) from Freeplay/calckey:settings into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10130
2023-05-16 17:58:01 +00:00
Freeplay
8bcb689580 fix border-radius of folder 2023-05-15 22:39:05 -04:00
Freeplay
ba55c3be4f fix noBg timeline BG's when wallpaper set 2023-05-15 22:05:43 -04:00
Freeplay
bda32c5fb4 move labels in migration page into caption 2023-05-15 21:45:17 -04:00
Freeplay
9142b3efdd fix show replies toggle not saving 2023-05-15 18:13:59 -04:00
Freeplay
cb145cd96e Accessible form components 2023-05-15 16:19:33 -04:00
April John
698a2c6912 Fix 2023-05-15 13:03:48 +00:00
April John
a2a9415839 Fix: add done statements 2023-05-15 12:25:54 +00:00
Freeplay
75dfd21918 organize settings 2023-05-14 22:10:52 -04:00
Kainoa Kanter
61295c8fbb Merge pull request 'Replace classic.vue w/ a class in universal.vue' (#10122) from Freeplay/calckey:classic into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10122
2023-05-14 23:55:54 +00:00
Kainoa Kanter
b9b6308cbf tooltip for edited 2023-05-14 16:52:31 -07:00
Freeplay
0c1aa3b59e classic view spacing 2023-05-14 19:19:00 -04:00
Freeplay
26e9d6fc6f Remove classic header (isn't used anywhere anymore) 2023-05-14 19:14:54 -04:00
Freeplay
2005b8279f tweak navbar 2023-05-14 19:10:59 -04:00
Freeplay
eac5b327af Change "Classic" to "Centered" 2023-05-14 19:10:48 -04:00
Kainoa Kanter
932929a4f1 chore: formatting 2023-05-14 15:20:26 -07:00
Kainoa Kanter
cd429df9b5 Revert "fix: 🐛 go to last timeline selected"
This reverts commit 4478468256777c8e7510038bdcb4f9c106f49481.
2023-05-14 15:19:58 -07:00
Kainoa Kanter
7d8c0798e5 Revert "feat: swap home timeline with social's functionality (#9597)"
This reverts commit df68d5ffff72bd960d2fcf33562da5e38a18fb3b.
2023-05-14 15:18:18 -07:00
Freeplay
fb21f501ef fix mobile navbar 2023-05-14 17:21:28 -04:00
Kainoa Kanter
362a5490e5 warn against graze for mastodon 2023-05-14 14:12:59 -07:00
Freeplay
c023972edc Replace classic.vue w/ a class in universal.vue 2023-05-14 17:06:58 -04:00
Kainoa Kanter
be75db9a11 remove duplicate 2023-05-14 13:45:36 -07:00
Kainoa Kanter
20438b9b16 Merge pull request 'Fix media not displaying when no body text' (#10121) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10121
2023-05-14 20:02:04 +00:00
Freeplay
db8495d354 button alignment 2023-05-14 15:33:50 -04:00
Freeplay
3b2e288ee1 fix image not displaying if no text 2023-05-14 15:31:07 -04:00
April John
6dc65e43af Feat: move post imports to new jobs 2023-05-14 20:20:31 +02:00
April John
6656c5f0cf Feat: move post imports to new jobs 2023-05-14 18:46:48 +02:00
Kainoa Kanter
d2fd405450 Merge pull request 'feat: automatically set antenna/list column names' (#10116) from naskya/calckey:feat/set-column-names-by-default into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10116
2023-05-14 14:04:03 +00:00
naskya
c4c26dae2f Set antenna/list column names automatically 2023-05-14 14:53:33 +09:00
naskya
7611ef9903 Change "Add caption" icon in Drive 2023-05-14 14:40:36 +09:00
naskya
1c442b5031 Use ph-flying-saucer for antenna column in Deck 2023-05-14 14:36:29 +09:00
amy bones
73d2f43cde Fix hover unblur text after keyboard nav changes 2023-05-13 16:30:46 -07:00
Kainoa Kanter
9171d3ae08 Use proper beta label 2023-05-13 13:04:53 -07:00
Kaity A
46fb825ad5 update translation 2023-05-14 00:57:37 +10:00
Kaity A
01329d3dad Update meta to include feaures 2023-05-14 00:51:31 +10:00
Kaity A
d974562b73 Update meta to return experimentals 2023-05-14 00:18:30 +10:00
Kaity A
ab4b798db5 Add page header to experiments 2023-05-14 00:04:24 +10:00
Kaity A
988d7cba06 fix meta update 2023-05-13 23:57:55 +10:00
Kaity A
804dbe6985 add experimental feature gate 2023-05-13 23:41:36 +10:00
Kaity A
7ff5f1f72e Merge branch 'develop' of https://codeberg.org/calckey/calckey into feature/edits 2023-05-13 22:13:02 +10:00
Kainoa Kanter
0f47689351 chore: formatting 2023-05-12 20:11:41 -07:00
Kainoa Kanter
1c8d1f1b88 todo 2023-05-12 20:05:25 -07:00
Kainoa Kanter
14fb2ffa8b Revert "add (back) pwa install button to help menu"
This reverts commit 298960f4dd5c54815e8e999d1e41ce4219904cb9.
2023-05-12 20:05:18 -07:00
Kainoa Kanter
2bbe03665b Revert "better icon"
This reverts commit 3808777c93dfe5188915e1266ecf08e5f18a8fb6.
2023-05-12 20:03:56 -07:00
Freeplay
c9f574dab2 tweak css 2023-05-12 21:54:59 -04:00
Freeplay
023ce7bb96 Only show mfm warning the first time + fix sparkle 2023-05-12 21:48:58 -04:00
Freeplay
5be27bf293 Add reduced motion & autoplay MFM toggles to welcome popup 2023-05-12 21:19:56 -04:00
Freeplay
f47a84af85 styling + remove log 2023-05-12 20:30:06 -04:00
Freeplay
5f2d19aab8 Settings option 2023-05-12 20:05:33 -04:00
Freeplay
dd7c71a6ba Merge branch 'develop' of https://codeberg.org/calckey/calckey into mfm-warn 2023-05-12 17:28:07 -04:00
Freeplay
fb78a0f58a add initial button 2023-05-12 00:46:26 -04:00
Kainoa Kanter
32e49102fe better icon 2023-05-11 19:11:53 -07:00
Kainoa Kanter
4f1f80f3a1 fix typo 2023-05-11 19:02:51 -07:00
Kainoa Kanter
d477a8904b add (back) pwa install button to help menu 2023-05-11 18:59:42 -07:00
Freeplay
0e1aeeb4f2 remove backdrop-filter in icon-only sidebar 2023-05-11 21:01:47 -04:00
Freeplay
4adefa06d2 fix 2023-05-11 20:52:30 -04:00
Freeplay
8ada43232e fix 2023-05-11 20:43:00 -04:00
Freeplay
d215006102 Fix wallpaper support for all views 2023-05-11 20:38:54 -04:00
Freeplay
76d3ca3ece Replace classic navbar w/ new 2023-05-11 19:46:42 -04:00
Freeplay
f9c2cde46e Replace classic view widgets w/ the one from default view 2023-05-11 18:34:44 -04:00
naskya
6024d55d45 Fix silly typo, format 2023-05-11 20:28:32 +09:00
naskya
6ac20d553c Add local only boost option 2023-05-11 20:10:19 +09:00
ThatOneCalculator
003ada4b11 calckey.org 2023-05-10 23:30:48 -07:00
syuilo
685860060f 念のためnoimageaiもつける 2023-05-10 20:51:22 -07:00
syuilo
d2dba136bf feat: 投稿したコンテンツのAIによる学習を軽減するオプションを追加
Co-authored-by: GitHub <syuilo>
2023-05-10 20:50:21 -07:00
Kainoa Kanter
c1eeef849e Merge pull request 'keyboard-accessibility' (#10084) from Freeplay/calckey:keyboard-accessibility into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10084
2023-05-10 22:20:57 +00:00
Freeplay
a47422df19 Fix more unfocusable elements 2023-05-10 17:44:08 -04:00
ThatOneCalculator
ab764b34bf call it "moderation notice" 2023-05-10 14:32:27 -07:00
ThatOneCalculator
b082822075 email padding 2023-05-10 14:29:43 -07:00
ThatOneCalculator
3519bffbbc improve emails 2023-05-10 14:27:46 -07:00
ThatOneCalculator
f4489af1bc don't need random style there 2023-05-10 14:21:32 -07:00
ThatOneCalculator
35047fd19c fix typo 2023-05-10 14:19:48 -07:00
ThatOneCalculator
4393eba659 fix button 2023-05-10 14:15:19 -07:00
ThatOneCalculator
355df50004 chore: formatting 2023-05-10 14:08:51 -07:00
ThatOneCalculator
e0a9a6e891 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-10 14:06:55 -07:00
ThatOneCalculator
f49f9d281e feat: ability for moderators to send mod mail 2023-05-10 14:06:45 -07:00
April John
909b12dff2 reintroduce async into post import 2023-05-10 22:26:31 +02:00
Freeplay
70198a8db1 some semantics 2023-05-10 16:20:52 -04:00
Freeplay
09ee93d332 Use tooltips as aria-labels 2023-05-10 15:15:27 -04:00
Essem
5b37235a29 Switch to adm-zip for emoji pack handling
Unzipper seems to corrupt files in certain cases on Node 18/19.
See https://github.com/ZJONSSON/node-unzipper/issues/271
2023-05-09 19:19:15 -05:00
ThatOneCalculator
a6d0fc5357 Address #10076 2023-05-09 15:15:13 -07:00
ThatOneCalculator
af4a812e88 properly link aps 2023-05-08 18:19:11 -07:00
Kainoa Kanter
de450c1aa2 Merge pull request 'display new direct replies at end instead of top' (#10071) from Freeplay/calckey:direct-reply-thing into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10071
2023-05-09 00:48:58 +00:00
Freeplay
566f11d96d display new direct replies at end instead of top 2023-05-08 19:41:56 -04:00
ThatOneCalculator
1ccd606236 fix opening info button 2023-05-08 16:26:36 -07:00
ThatOneCalculator
53b7ce83b2 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-08 16:15:11 -07:00
ThatOneCalculator
5e13a52a51 missed one 2023-05-08 16:15:04 -07:00
Freeplay
ee04acf087 fix quote attached styling, will prob improve later 2023-05-08 17:26:59 -04:00
ThatOneCalculator
7ab2670ea6 mention 2023-05-08 13:52:11 -07:00
April John
3fda23c7dd Revert "fix: run post import async"
This reverts commit 3bedd1b34799d969cd218b4a1a67651532a204e6.
2023-05-08 22:48:12 +02:00
ThatOneCalculator
1400a01958 example.com -> calckey.org 2023-05-08 13:39:39 -07:00
ThatOneCalculator
b92237c8d2 chore: formatting 2023-05-08 13:36:53 -07:00
ThatOneCalculator
72b224a40c Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-08 13:36:28 -07:00
ThatOneCalculator
04d0e002e9 fix: allow disabled radio buttons when created from radios.vue 2023-05-08 13:36:22 -07:00
April John
369fd4daea fix: run post import async 2023-05-08 22:30:40 +02:00
April John
3a8e6a19b2 import replies too 2023-05-08 22:09:42 +02:00
April John
77f74f51b3 try fetching replies 2023-05-08 22:09:42 +02:00
ThatOneCalculator
39c6949321 chore: formatting 2023-05-08 13:01:06 -07:00
ThatOneCalculator
3dc2a591ec Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-08 13:00:44 -07:00
ThatOneCalculator
cb292c43b4 update import-export options 2023-05-08 13:00:34 -07:00
Kainoa Kanter
5808d27b44 Merge pull request 'fix click.stop' (#10068) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10068
2023-05-08 19:51:44 +00:00
Freeplay
09610b89cb fix click.stop 2023-05-08 15:39:20 -04:00
ThatOneCalculator
e5e7fb5ab2 add back #10067 except for media change 2023-05-08 12:38:56 -07:00
ThatOneCalculator
df914667e6 Revert "notes (#10067)"
This reverts commit 84f904516c9709b8f5692e7a0d011c259a8425d9, reversing
changes made to 0c742929a53f159ef85775a436d99ab7a49e6d99.
2023-05-08 12:37:28 -07:00
Freeplay
5cbd2a53b2 fix clicking audio & search mfm opening post 2023-05-08 13:59:39 -04:00
Freeplay
3672d8c995 fix padding 2023-05-08 13:45:00 -04:00
April John
2a69ade176 fix: dont stream hidden posts 2023-05-08 19:33:04 +02:00
April John
f950c33f79 fix: Detach push notifications..
..from "isRead" check. Apps will handle that theself.
2023-05-08 11:36:32 +02:00
April John
c6d432b2d2 fix hidden post behavior 2023-05-08 11:23:30 +02:00
ThatOneCalculator
bcaf30f49f missing action + locales 2023-05-07 19:05:05 -07:00
ThatOneCalculator
c51b023ff4 calckey.org 2023-05-07 18:57:50 -07:00
ThatOneCalculator
d870b06c56 remove reference to apps.vue 2023-05-07 18:53:15 -07:00
ThatOneCalculator
07ff19008a refactor: remove internal apps page 2023-05-07 18:49:56 -07:00
ThatOneCalculator
3dce8786ef fix: only fetch admin/meta if admin 2023-05-07 18:41:31 -07:00
ThatOneCalculator
1cc33dc0de fix incomplete revert 2023-05-07 18:05:11 -07:00
ThatOneCalculator
52e67728c1 Revert "fix: hidden post federation"
This reverts commit 8a51c73fe705d4c86886ae6b5cc2b9a8dd7dcfb8.
2023-05-07 18:01:36 -07:00
ThatOneCalculator
d3fb7794f1 chore: format 2023-05-07 16:12:18 -07:00
ThatOneCalculator
6cab12dc24 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-07 16:11:37 -07:00