natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity
25,017 Commits 19 Branches 1,627 Tags 486 MiB
Commit Graph

4133 Commits

Author SHA1 Message Date
Freeplay 1276025e1d Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-10 19:35:02 -04:00
Freeplay fbc67ca745 force advanced MFM in posting form preview 2023-06-10 19:34:20 -04:00
Freeplay 4bf7357c30 format 2023-06-10 18:33:39 -04:00
Freeplay 2ec1e09105 remove scrollbars 2023-06-10 18:08:06 -04:00
Freeplay 5893b4c117 simpler way lol 2023-06-10 16:49:07 -04:00
Kainoa Kanter f6c2acc7f5 Merge pull request '[PR]: Fix invalid CSP policy' (#10296) from esm/calckey:fix/note-csp-urls into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10296
 2023-06-09 18:51:53 +00:00
ThatOneCalculator 3cc8f60ee9
feat: ✨ delay function in animated MFM 2023-06-09 11:46:55 -07:00
ThatOneCalculator 3f3d777e6e
update cheat sheet with delay 2023-06-09 10:52:20 -07:00
Essem 84be788034
Fix CSP 2023-06-09 11:15:49 -05:00
Freeplay 27a935a2ff scrollable sticky widgets attempt 2023-06-08 23:33:39 -04:00
ThatOneCalculator f5945269bf
revert method 2023-06-08 13:27:28 -07:00
Hosted Weblate abf8e4f585
chore: Merge branch 'origin/develop' into Weblate. 2023-06-08 22:20:42 +02:00
ThatOneCalculator c5d102021e
perf: set patrons in redis 2023-06-08 13:19:46 -07:00
ThatOneCalculator 31acc8caad
patron async computed 2023-06-08 12:51:05 -07:00
ThatOneCalculator 8cbfcedf92
old patrons method 2023-06-08 12:40:47 -07:00
ThatOneCalculator f2d8882fd5
Merge branch 'patron-labels' into develop 2023-06-08 12:33:51 -07:00
ThatOneCalculator fb71b7beff
Revert "fix logic" 
This reverts commit 8734de13f1.
 2023-06-08 11:35:31 -07:00
ThatOneCalculator 2945f25268
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-08 11:22:16 -07:00
ThatOneCalculator 8734de13f1
fix logic 2023-06-08 11:22:11 -07:00
Freeplay 63255b5641 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-08 14:16:06 -04:00
Freeplay 449a75319a allow scrolling from body again, keep scrollbar in widgets 2023-06-08 14:16:00 -04:00
ThatOneCalculator 9f931e6e8b
fix: unread message bgcolor 2023-06-08 11:13:45 -07:00
ThatOneCalculator 5769bdcc69
chore: formatting 2023-06-08 11:01:00 -07:00
Kainoa Kanter 1186969ee6 Merge pull request '[PR]: Improve the order of note menu items' (#10290) from naskya/calckey:chore/note-menu-order into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10290
 2023-06-08 17:53:32 +00:00
naskya db37f2f8e0
change style 2023-06-08 17:47:21 +00:00
Kainoa Kanter d7b3813c9a Merge pull request '[PR]: feat: channel column in deck view' (#10291) from naskya/calckey:feat/deck-channel-column into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10291
 2023-06-08 16:52:43 +00:00
Kainoa Kanter 4dbe74a6bd Merge pull request '[PR]: Split content/sidebar scrolling on default/centered views' (#10292) from esm/calckey:fix/column-scroll-split into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10292
 2023-06-08 16:46:42 +00:00
Kainoa Kanter cfa339a51b Merge pull request '[PR]: fix: take invalid expiresAt of polls as null' (#10279) from nmkj/calckey:fix-poll-expire into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10279
 2023-06-08 16:46:14 +00:00
Essem 6aa3c301e3
Attempt to split column scrolling 2023-06-08 10:06:22 -05:00
naskya f4bf5cc447
feat: channel column in deck view 2023-06-08 13:29:19 +00:00
naskya 91190244fb
change note menu order 2023-06-08 19:02:50 +09:00
Konni (im Schloss) 2d8ad9389c fixes #10284, fixes #10208; passing in all pugVariables needed in base.pug, fixes csp 2023-06-07 20:35:24 +02:00
Namekuji ab9b9e5bff
fix inbox stall 2023-06-07 10:01:16 -04:00
ThatOneCalculator e13af49118
dont lint in format 2023-06-06 21:02:02 -07:00
ThatOneCalculator ca5ae3a4c9
chore: lint sw 2023-06-06 21:01:28 -07:00
ThatOneCalculator 90c0e4e9ed
allow iframes for notes 2023-06-06 21:00:16 -07:00
ThatOneCalculator abe8474883
fix server metric iteration 2023-06-06 19:10:43 -07:00
ThatOneCalculator 23d59b634b
fix: only show meili in metrics if available 2023-06-06 19:08:41 -07:00
ThatOneCalculator 0c5be99d77
perf: limit number of antennas 2023-06-06 18:47:06 -07:00
ThatOneCalculator 6825595bdc
feat: ✨ patron labels 2023-06-06 18:43:05 -07:00
ThatOneCalculator eda82780de
feat: ✨ searchFilters meta property 2023-06-06 16:19:13 -07:00
ThatOneCalculator 047e923660
refactor: client assets 2023-06-06 13:03:15 -07:00
ThatOneCalculator 349411ac76
typo 2023-06-06 12:16:49 -07:00
ThatOneCalculator f621e58efa
fix: post editing meta 2023-06-06 12:11:15 -07:00
CaffeeLake cb8f1617c7
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-06 04:32:22 -04:00
ThatOneCalculator c5a0c01e4e
Revert "chore: formatting" 
This reverts commit 36283b9a35.
 2023-06-05 21:15:49 -07:00
ThatOneCalculator 9bd03cc92e
update cargo.lock 2023-06-05 18:55:27 -07:00
ThatOneCalculator 5483dd567f
Don't ignore Cargo.lock 2023-06-05 18:49:27 -07:00
Freeplay bea409b4fa Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 20:54:25 -04:00
Freeplay 747a71ddc4 fix cw button pos... oops 2023-06-05 20:54:21 -04:00
ThatOneCalculator ed674f2dac
chore: format 2023-06-05 17:27:40 -07:00
Freeplay 96b6c433c8 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 20:15:21 -04:00
Freeplay 6bddeac975 fix 2023-06-05 20:15:17 -04:00
ThatOneCalculator 36283b9a35
chore: formatting 2023-06-05 16:40:48 -07:00
Kainoa Kanter 5b73351e80 Merge pull request '[PR]: Add delay to MFM' (#10248) from Freeplay/calckey:mfm into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10248
 2023-06-05 22:38:33 +00:00
ThatOneCalculator c664d7da08
fix 2023-06-05 15:08:35 -07:00
Freeplay 035d6660be Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-05 18:07:53 -04:00
Freeplay 63798dd4b7 remove invalid css 2023-06-05 18:07:42 -04:00
ThatOneCalculator a018bfca9a
dep: down typeorm 2023-06-05 15:02:59 -07:00
ThatOneCalculator 4f16bdea78
chore: ⬆️ up deps 2023-06-05 14:54:43 -07:00
Kainoa Kanter a60cb874c1 Merge pull request '[PR]: Meilisearch Stop-Words' (#10261) from PrivateGER/calckey:feat/meilisearch-stop-words into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10261
 2023-06-05 21:39:31 +00:00
Kainoa Kanter c32d26e6c7 Merge pull request '[PR]: Fix database connection URL' (#10263) from nmkj/calckey:fix-database-url into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10263
 2023-06-05 21:36:48 +00:00
Freeplay 9382afeb5e comment out easing part for now 2023-06-05 15:28:42 -04:00
Freeplay 6f1bdf79cd fix collapsed height 2023-06-05 15:07:04 -04:00
Freeplay 807093b94c Better post clipping 2023-06-05 13:11:14 -04:00
Namekuji cf3f566e06
escape database password as it may contain special characters 2023-06-05 11:59:45 -04:00
Freeplay de65c3c3f6 the better way of doing advanced MFM™ 2023-06-05 11:55:21 -04:00
Freeplay 60960d659d fix in cheat sheet also, I've realized I will need to do it a different at some point but this works for now. 2023-06-05 11:41:56 -04:00
Freeplay c25b80d39a Fix animated MFM not playing in posting form preview 2023-06-05 11:33:48 -04:00
Freeplay 47e3acd233 center-align navbar icons 2023-06-04 18:16:54 -04:00
Freeplay 517e0a16f3 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-04 17:52:49 -04:00
Freeplay 7c436d0a41 Prevent newly-made unlisted posts from showing in antennas 2023-06-04 17:52:44 -04:00
Kainoa Kanter f1e8099c48 Merge pull request '[PR]: Fix docker' (#10259) from nmkj/calckey:fix-docker into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10259
 2023-06-04 21:48:39 +00:00
ThatOneCalculator 6a7e950f21
chore: formatting 2023-06-04 14:42:22 -07:00
ThatOneCalculator acc3b672bc
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-04 14:41:30 -07:00
ThatOneCalculator 535fa9f506
fix: 🐛 prevent null date insertion 
https://calckey.aokaga.work/notes/9f6ksv2oov
 2023-06-04 14:41:18 -07:00
Namekuji 9a9c3d4c62
add rust to the runtime container for migrations 2023-06-04 16:29:24 -04:00
Freeplay b0cd3b25fc fix background of mentions 2023-06-04 16:29:12 -04:00
Freeplay 3b889d9c05 header spacing 2023-06-04 16:05:06 -04:00
Freeplay c4fa29be50 i18n to more button in navbar 2023-06-04 15:46:11 -04:00
Freeplay 49d2c87e50 'clip' to 'clips' #10255 2023-06-04 15:39:23 -04:00
Freeplay 9e6a553434 preload antennas & lists 2023-06-04 15:31:42 -04:00
ThatOneCalculator 482c21d00e
chore: format 2023-06-04 12:02:34 -07:00
Kainoa Kanter 89330c5161 Merge pull request '[PR]: Add advanced MFM toggle' (#10254) from Freeplay/calckey:advanced-mfm into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10254
 2023-06-04 18:59:56 +00:00
Talon 4a9e442abb Merge branch 'develop' into fix/more-accessibility 2023-06-04 12:41:40 +02:00
Freeplay 15b30231eb Allow clicking pfp in header of note page 2023-06-03 22:20:42 -04:00
Freeplay 5a3e14fa32 Forgot clip-path 2023-06-03 17:26:37 -04:00
Freeplay c80e106fb5 Advanced MFM toggle 2023-06-03 17:12:08 -04:00
Freeplay 28780772cb tweak 2023-06-03 13:43:08 -04:00
Freeplay 47a38969eb Highlight boost button if boosted! 2023-06-03 12:57:51 -04:00
Freeplay d780fea36a Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-03 10:47:48 -04:00
Freeplay 9c424ee041 Fix blue highlight on post tap 2023-06-03 10:47:41 -04:00
TalonTheDragon 3d951c7f4b Merge branch 'develop' into fix/more-accessibility 2023-06-03 12:42:20 +02:00
ThatOneCalculator 02658fee0b
chore: ⬆️ up various deps 2023-06-03 00:41:30 -07:00
ThatOneCalculator 8b223bd5bf
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 23:55:41 -07:00
ThatOneCalculator 99df1dcbd7
fix: summary if 1 attachment 2023-06-02 23:55:31 -07:00
Kainoa Kanter 89d5810e63 Merge pull request '[PR]: Switch position of Social and Recommended timelines' (#10239) from naskya/calckey:social-recommended-position-switch into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10239
 2023-06-03 06:40:16 +00:00
ThatOneCalculator 2ec387de4a
regress: no metrics in dashboard for now 2023-06-02 23:38:05 -07:00
ThatOneCalculator dbe00078a3
refactor: remove mk remnants 2023-06-02 23:30:51 -07:00
ThatOneCalculator 6956522694
perf: インスタンスデフォルトテーマを予めjson5 -> jsonに変換しておくことでjson5を初期バンドルに含めずに済むように 
Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
 2023-06-02 23:28:21 -07:00
naskya 0eb65d0f12
fix tutorial 2023-06-03 15:24:16 +09:00
ThatOneCalculator c1f699789b
chore: formatting 2023-06-02 23:21:06 -07:00
ThatOneCalculator f2a1d5643b
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 23:20:46 -07:00
ThatOneCalculator 696c07b19a
fix: remove unessicary extra line in note menu 2023-06-02 23:20:34 -07:00
Kainoa Kanter d81af5e991 Merge pull request '[PR]: feat: rust backend model and utilities' (#10250) from nmkj/calckey:native-model into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10250
 2023-06-03 06:00:46 +00:00
ThatOneCalculator f3bd82b074
refactor: ♻️ sync note summaries 2023-06-02 22:11:34 -07:00
ThatOneCalculator 7ea4c39fb7
refactor: ♻️ ssr views 
Correct og:type for users, format docs, deprecate _info_card_
 2023-06-02 21:45:11 -07:00
Namekuji 382b009ffd
add cargo test script 2023-06-03 00:40:51 -04:00
Namekuji 15f8a4cbba
cargo formats all modules 2023-06-03 00:37:10 -04:00
Namekuji d7f80edbea
call seaorm migrations after typeorm 2023-06-03 00:27:00 -04:00
Namekuji afe4c76392
fix migration 2023-06-02 23:48:28 -04:00
Namekuji d3d30bbbc2
add integration test of antenna 2023-06-02 23:48:28 -04:00
Namekuji 874b0a2c69
add unit test 2023-06-02 23:48:27 -04:00
Namekuji 7cf2b39cde
fix unit tests 2023-06-02 23:48:27 -04:00
Namekuji c443a5601c
add format script 2023-06-02 23:48:27 -04:00
Namekuji 0224824a36
fix native import 2023-06-02 23:48:26 -04:00
Namekuji 10072d6e4d
remove node cuid2 2023-06-02 23:48:26 -04:00
Namekuji ba578c8701
initialize native database on boot 2023-06-02 23:48:25 -04:00
Namekuji 8bb87f9ea4
use native generators 2023-06-02 23:48:25 -04:00
Namekuji 55118df538
add test 2023-06-02 23:48:25 -04:00
Namekuji a10ade8cf5
fix unit test 2023-06-02 23:48:24 -04:00
Namekuji 752d63e6de
add native calls 2023-06-02 23:48:24 -04:00
Namekuji e932d6effa
use schema in native-utils 2023-06-02 23:48:24 -04:00
Namekuji 5e9dce3e8c
adjust module structure 2023-06-02 23:48:23 -04:00
Namekuji 148dbbe56d
move files out from crate 2023-06-02 23:48:23 -04:00
Namekuji 403e95b673
fix unit test 2023-06-02 23:48:22 -04:00
Namekuji e51deb3794
add napi schema 2023-06-02 23:48:22 -04:00
Namekuji d0734ef4c9
add pack_by_id 2023-06-02 23:48:22 -04:00
Namekuji c9f31aef9b
add default values 2023-06-02 23:48:21 -04:00
Namekuji 3eb87c8f04
rename feature 2023-06-02 23:48:21 -04:00
Namekuji 193c75a2bb
skip empty array 2023-06-02 23:48:21 -04:00
Namekuji d9d2673939
use thread to copy data 2023-06-02 23:48:20 -04:00
Namekuji 3010ac9e74
use iden enum 2023-06-02 23:48:20 -04:00
Namekuji d28f74b513
fix primary key specifier 2023-06-02 23:48:20 -04:00
Namekuji 98f2397fbb
add migration to convert array to jsonb 2023-06-02 23:48:19 -04:00
Namekuji 745384ff58
use vec newtype 2023-06-02 23:48:19 -04:00
Namekuji 6178593e22
make sqlite compat 2023-06-02 23:48:19 -04:00
Namekuji 354ece6432
add abstraction of string array type 2023-06-02 23:48:18 -04:00
Namekuji 0bd5893e7d
fix varchar array 2023-06-02 23:48:18 -04:00
Namekuji 1455068e0c
add newtype 2023-06-02 23:48:18 -04:00
Namekuji 76e5e31411
todo unread note check 2023-06-02 23:48:17 -04:00
Namekuji 6698c00f78
rename test modules 2023-06-02 23:48:17 -04:00
Namekuji 6bbfe1a6b4
add tests 2023-06-02 23:48:17 -04:00
Namekuji 4012d38f7f
add integration test in model 2023-06-02 23:48:16 -04:00
Namekuji 737ccfe11c
remove mock database 2023-06-02 23:48:16 -04:00
Namekuji f1f3e5976d
add random string generator 2023-06-02 23:48:15 -04:00
Namekuji 6bb8775b2e
change aid to cuid2 2023-06-02 23:48:15 -04:00
Namekuji eda1e7ab3b
fix features 2023-06-02 23:48:15 -04:00
Namekuji 00ba8a2804
return mock db when mock feature is enabled 2023-06-02 23:48:14 -04:00
Namekuji 2f9a6859f1
add utility crate 2023-06-02 23:48:14 -04:00
Namekuji 535eb3540b
add mock database 2023-06-02 23:48:14 -04:00
Namekuji d453eaf4ae
remove unused feature 2023-06-02 23:48:13 -04:00
Namekuji 81ba464f1b
format 2023-06-02 23:48:13 -04:00
Namekuji 9220aa3e4c
remove unused serde 2023-06-02 23:48:13 -04:00
Namekuji bc0e0b14d0
add repository trait 2023-06-02 23:48:12 -04:00
Namekuji 4e82dab1eb
add entities and two schemas 2023-06-02 23:48:07 -04:00
ThatOneCalculator 14126de3d7
chore: formatting 2023-06-02 20:06:04 -07:00
ThatOneCalculator 44d77f60ef
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 20:05:19 -07:00
mappi bf54fb70af
fix: vue-plyr audio tag 
Co-authored-by: mappi <mappi-pr@github.com>
 2023-06-02 20:05:02 -07:00
Freeplay 217b389a7b tweak 2023-06-02 22:57:04 -04:00
Freeplay bf21b84129 fix mfm-cheat-sheet styling 2023-06-02 22:54:23 -04:00
Freeplay 9ee51bc690 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-02 21:05:46 -04:00
Freeplay 389ca3f332 aria to acc menu button 2023-06-02 21:04:51 -04:00
ThatOneCalculator f8879650c6
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 15:45:15 -07:00
ThatOneCalculator b0a04faaba
fix: ♻️ use locale for error 
https://calckey.social/notes/9fippqiwhl287b5m
 2023-06-02 15:45:05 -07:00
Freeplay 83d5415801 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-02 18:14:43 -04:00
Freeplay 903d12f18f fix gap 2023-06-02 18:14:39 -04:00
ThatOneCalculator 8e5a374ac7
chore: formatting 2023-06-02 14:53:28 -07:00
ThatOneCalculator 088ff4c251
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 14:52:58 -07:00
ThatOneCalculator 4cbf73140c
fix: show message on error alert if text is null 2023-06-02 14:52:44 -07:00
Freeplay 6233883cd0 hide close button bottom fade for now 2023-06-02 17:23:09 -04:00
Freeplay d8d2ee266e Setup to also support steps 2023-06-02 15:39:33 -04:00
Freeplay c722cee101 Idk why I used ?? there 2023-06-02 15:06:57 -04:00
Freeplay 1efb167f8f Add delay & start adding cubic-bezier to mfm 2023-06-02 14:44:41 -04:00
Kainoa Kanter caa6408e03 Merge pull request '[PR]: Add an option to toggle opening post on click' (#10242) from Freeplay/calckey:note-click into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10242
 2023-06-01 20:44:56 +00:00
Kainoa Kanter e3b337e115 Merge pull request 'Add raw zip emoji imports' (#10246) from PrivateGER/calckey:fix/no-metadata-emoji-import into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10246
 2023-06-01 20:43:57 +00:00
PrivateGER 7eeac4810a formatter 2023-06-01 21:38:37 +02:00
PrivateGER 9be58ba0b4 missing inversion + use proper emoji path 2023-06-01 21:30:23 +02:00
PrivateGER d409c31ad5 me when I lack a brain 2023-06-01 21:12:03 +02:00
PrivateGER f508a358b1 more logging 2023-06-01 21:01:15 +02:00
ThatOneCalculator 35e72bfca7
chore: formatting 2023-06-01 11:55:13 -07:00
PrivateGER 4d2eaa645b Import emojis without meta.json 2023-06-01 20:53:13 +02:00
Freeplay c5cd624d82 Add expand on note click option 2023-05-31 23:52:05 -04:00
Freeplay 2515319c08 hide back button when not needed 2023-05-31 22:38:14 -04:00
Freeplay b0390a3fc0 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-05-31 22:10:49 -04:00
Freeplay 1548fc2f2a Fix #10219 2023-05-31 22:10:44 -04:00
Kainoa Kanter 001e31bfcd Merge pull request '[PR]: fix: import settings backup' (#10240) from naskya/calckey:fix/import-settings-backups into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10240
 2023-06-01 00:35:15 +00:00
Freeplay c97c6fbe5b hide broken logged-out header link for now 2023-05-31 19:43:58 -04:00
Freeplay b9046573e1 fix 2023-05-31 19:35:02 -04:00
naskya 7b02b87ec6
format 2023-06-01 08:01:24 +09:00
naskya 151f5e355d
Fix exported settings being not importable 2023-06-01 07:55:59 +09:00
naskya 0a99366298
no change, but more comfortable 2023-06-01 07:29:54 +09:00
naskya 9d9047c33d
switch position of social and recommended 2023-06-01 07:24:49 +09:00
Freeplay 618042c3e3 lemme just update that 2023-05-31 17:59:03 -04:00
Freeplay f3bdce0636 Fix #10236 2023-05-31 17:02:58 -04:00
Freeplay 0663a67b86 fix 2023-05-31 16:41:31 -04:00
Freeplay 3443e5d649 button styling 2023-05-31 16:34:29 -04:00
Kainoa Kanter 38b92b7aee 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 831abc22d0 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 88892d886e
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-31 12:06:34 -07:00