Commit graph

22597 commits

Author SHA1 Message Date
ThatOneCalculator
ccd55c5251 chore: fix rebuild 2022-12-17 16:59:03 -08:00
ThatOneCalculator
0cbab4c084 Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-17 16:55:50 -08:00
ThatOneCalculator
1b19eab391 feat: 🥴 2022-12-17 16:55:40 -08:00
Kainoa Kanter
935b26823b docker-compose-port-fix (#9251) 2022-12-18 00:07:46 +00:00
finner
9ae1bab9c6 port fix 2022-12-18 01:04:39 +01:00
finner
ccb36a58a4 fixed additional path to .config 2022-12-18 00:47:27 +01:00
Kainoa Kanter
68b0d139b3 Remove duplicate 2022-12-17 20:27:56 +00:00
yawhn
34b9f32d29 Merge branch 'main' of https://codeberg.org/yawhn/elreqkey 2022-12-17 21:18:55 +02:00
ThatOneCalculator
907a021537 docs: 📝 fix spacing 2022-12-17 10:22:33 -08:00
ThatOneCalculator
270a68fc15 docs: 📝 more images 2022-12-17 10:22:12 -08:00
ThatOneCalculator
ed0e1951d9 docs: 📝 weblate 2022-12-17 10:21:17 -08:00
ThatOneCalculator
5829e92fdb feat: weblate! 2022-12-17 10:17:39 -08:00
ThatOneCalculator
fa73f57a8b chore: update gitignore 2022-12-17 09:57:57 -08:00
ThatOneCalculator
7f91f5b5a1 chore: remove unicode fault in KO 2022-12-17 09:50:13 -08:00
ThatOneCalculator
4b23d30b1c chore: Update patron list 2022-12-17 09:43:36 -08:00
ThatOneCalculator
bacac3eb9e Merge remote-tracking branch 'chimiana/develop' into develop 2022-12-17 09:25:08 -08:00
ThatOneCalculator
f6589655b1 chore: dockerfile cleanup 2022-12-17 09:22:25 -08:00
finner
6b67e0ab3f change port setting 2022-12-17 17:27:12 +01:00
chimiana
1691e138cc roll back changes to example.yml 2022-12-17 06:58:33 +00:00
ThatOneCalculator
91893ea5c7 chore: lint 2022-12-16 18:28:05 -08:00
chimiana
a8d2800504 Merge branch 'flatwebp' into develop 2022-12-17 02:27:43 +00:00
chimiana
41158e9224 Fix for #9194, converts webp to png instead of jpg, preserving transparency 2022-12-17 02:26:19 +00:00
chimiana
84eb341354 update example.yml with container names specified in docker-compose, to support running either a dev or production containers off the same configs 2022-12-17 00:35:21 +00:00
chimiana
27b77cef80 Changes to server admin docker-compose.yml to support having both a dev and a production docker-compose running off the same configs 2022-12-17 00:31:39 +00:00
chimiana
edf7af790b Changed filenames and .gitignore to allow a working docker-compose next to the example provided 2022-12-17 00:25:46 +00:00
ThatOneCalculator
f0507efeb0 fix: use correct color for MkMoved 2022-12-16 14:52:43 -08:00
ThatOneCalculator
30fe02debb Merge branch 'develop' of codeberg.org:thatonecalculator/calckey into develop 2022-12-16 14:38:25 -08:00
ThatOneCalculator
d52ceb0150 refactor: 👥 update cleo link 2022-12-16 14:38:18 -08:00
Kainoa Kanter
265314063d Update 'docker-README.md' 2022-12-16 22:34:27 +00:00
Kainoa Kanter
3451c500b9 fix-docker-env-path (#9241) 2022-12-16 22:25:45 +00:00
finner
ce7bebaeb7 Fixed path to docker.env on line 36 in docker-compose.yml. 2022-12-16 22:59:10 +01:00
ThatOneCalculator
e389d28b02 Fix spacing 2022-12-16 13:39:45 -08:00
ThatOneCalculator
ab4e3e188f docs: 📝 badges [CI Skip] 2022-12-16 13:36:50 -08:00
ThatOneCalculator
5f1a4c634d docs: 📝 more badges 2022-12-16 13:30:58 -08:00
ThatOneCalculator
37f3f79c29 Add cafkafk to patron list 2022-12-16 12:08:26 -08:00
ThatOneCalculator
d77db38d71 fix typo 2022-12-16 11:12:32 -08:00
Kainoa Kanter
56e370d779 Merge pull request 'Fix logo icons' (#9240) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9240
2022-12-16 18:51:08 +00:00
ThatOneCalculator
11bf1a98d0 Fix logo icons 2022-12-16 10:50:26 -08:00
Kainoa Kanter
a4ee13cd14 Merge pull request 'develop' (#9239) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9239
2022-12-16 18:44:50 +00:00
ThatOneCalculator
d2e0dbfa73 refactor: rm .github folder 2022-12-16 10:44:09 -08:00
ThatOneCalculator
71f9378d35 fix: insert into correct textarea 2022-12-16 10:40:08 -08:00
ThatOneCalculator
b395874945 fix: css class match 2022-12-16 10:36:53 -08:00
ThatOneCalculator
2be8bf2078 feat: Insert text at cursor for caption 2022-12-16 10:25:05 -08:00
ThatOneCalculator
0494feb4ae fix: 🐛 fix inconsistent theming 2022-12-16 10:21:10 -08:00
Kainoa Kanter
2608c3d92b docs: 📝 fix badge position 2022-12-16 17:35:54 +00:00
Cleo
46b636fb4f Merge pull request 'its "main"' (#9238) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9238
2022-12-16 17:14:28 +00:00
Cleo
d7492ff36d its "main"
Signed-off-by: Cleo <cutestnekoaqua@noreply.codeberg.org>
2022-12-16 17:13:41 +00:00
Kainoa Kanter
991a65c0a1 Merge pull request 'develop' (#9237) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9237
2022-12-16 17:07:51 +00:00
Kainoa Kanter
1f497468f4 Merge pull request 'Add FK abuse_user_report.targetUserId -> user.id (closes #9227)' (#9236) from undefined/calckey:add_fk_abuse_user_report_target_user_id into develop
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9236
2022-12-16 17:02:20 +00:00
Cleo
5a676912fb Merge pull request 'v13' (#9235) from develop into main
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9235
2022-12-16 16:59:54 +00:00