Commit Graph

4008 Commits

Author SHA1 Message Date
amcmanu3
a76a2722db Fix child schedule failing to load after del parent 2024-04-19 16:05:35 -04:00
--unset
227d642546 Set audit logging to logfile instead of DB 2024-04-17 18:03:10 -04:00
--unset
89b552a880 Redirect to /login if garbage is in query args 2024-04-16 10:26:32 -04:00
--unset
92bd7b80c8 Remove console log on login 2024-04-16 10:26:09 -04:00
Analicia Abernathy
6c28ef6327 Update cs_CS.json 2024-04-15 17:48:53 -05:00
Analicia Abernathy
2a601c9f31 update translations for refactor/api-key-su 2024-04-11 09:16:03 -05:00
Analicia Abernathy
ab18daebe7 Merge branch 'refactor/api-key-su' of gitlab.com:crafty-controller/crafty-4 into refactor/api-key-su 2024-04-10 18:19:11 -05:00
Analicia Abernathy
ed37387fbf updated translations for branch refactor/api-key-su 2024-04-10 18:18:44 -05:00
amcmanu3
400f42ba26 Merge branch 'dev' into refactor/api-key-su 2024-04-08 13:42:16 -04:00
Analicia Abernathy
ba39480c51 Merge branch 'tweak/error-return' of gitlab.com:crafty-controller/crafty-4 into tweak/error-return 2024-04-07 18:25:15 -05:00
Analicia Abernathy
36f2256273 Update languages for merge 743 2024-04-07 18:25:05 -05:00
Zedifus
0fbf14063c Fix CL 4.3.3
Duplicate head
2024-04-07 02:33:34 +01:00
Zedifus
8106966146 Prepare 4.3.3 release base 2024-04-07 01:58:29 +01:00
Zedifus
56d098ef86 Update changelog 3c7c05b4 2024-04-07 01:04:56 +01:00
Zedifus
77b0c2c9d2 Add openjdk-21 to docker img 2024-04-07 00:36:10 +01:00
Zedifus
3c7c05b405 Close changelog v4.3.2 2024-04-07 00:17:16 +01:00
Iain Powrie
27dae48cd2 Merge branch 'bugfix/api-perms-request' into 'dev'
Fix API perms request returning stack

See merge request crafty-controller/crafty-4!745
2024-04-06 23:11:30 +00:00
Zedifus
d03fa57d0b Update changelog !745 2024-04-07 00:07:28 +01:00
Zedifus
20a8366410 Merge branch 'dev' into bugfix/api-perms-request 2024-04-07 00:06:15 +01:00
Iain Powrie
0e8c8d4da8 Merge branch 'sec/bump-orjson' into 'dev'
Bump orjson for CVE-2024-27454

See merge request crafty-controller/crafty-4!747
2024-04-06 22:51:22 +00:00
Zedifus
2357b9fa21 Make help text in repo templates comments.
People aren't removing the example text, thus MR's and issues are messy
2024-04-06 23:41:24 +01:00
Iain Powrie
cb98402878 Merge branch 'tweak/permissions-fix' into 'dev'
Fix permission script

See merge request crafty-controller/crafty-4!740
2024-04-06 22:08:05 +00:00
Iain Powrie
0abb81e6f8 Merge branch 'tweak/reverse-sbuilder-sjar-versions' into 'dev'
Reverse order of returned server jars versions

See merge request crafty-controller/crafty-4!746
2024-04-06 21:59:56 +00:00
Zedifus
2139421135 Update changelog !747 2024-04-06 22:56:14 +01:00
Zedifus
6313380922 Fix calling of orjson .JSONDecodeError class 2024-04-06 22:54:43 +01:00
Zedifus
ff20705f32 Update changelog !747 2024-04-06 22:35:10 +01:00
Zedifus
8f692d885f Bump orjson for CVE-2024-27454 2024-04-06 22:32:14 +01:00
Zedifus
03717d453a Update changelog !746 2024-04-06 22:06:02 +01:00
Zedifus
057139c7e1 Rerverse order of returned server jars versions
Logic I removed in my refactor, whoops!

Newest -> oldest
2024-04-06 22:01:37 +01:00
Iain Powrie
6a71b7d28c Merge branch 'bugfix/uuid-server-clone' into 'dev'
Fix server clones following uuid migration

See merge request crafty-controller/crafty-4!741
2024-04-06 20:43:37 +00:00
Zedifus
b4a962b5a6 Update changelog !741 2024-04-06 21:39:30 +01:00
Zedifus
a2dc3a8a45 Merge branch 'dev' into bugfix/uuid-server-clone 2024-04-06 21:37:53 +01:00
Iain Powrie
3fd71a3b77 Merge branch 'tweak/server-jars-domain-swap' into 'dev'
Refactor ServerJars caching and move to api.serverjars.com

See merge request crafty-controller/crafty-4!744
2024-04-06 20:25:47 +00:00
amcmanu3
4f469f3df1 Do not allow clone while server is running 2024-04-06 16:24:55 -04:00
Zedifus
5d9a3b57ec Update changelog !744 2024-04-06 21:08:10 +01:00
Zedifus
1b9646cd0f Merge branch 'dev' into tweak/server-jars-domain-swap 2024-04-06 21:06:11 +01:00
Iain Powrie
33f55c24b1 Merge branch 'bugfix/backup-restore-uuid' into 'dev'
Fix backup restore failure

See merge request crafty-controller/crafty-4!736
2024-04-06 19:57:37 +00:00
Zedifus
52a4ba4a97 Update changelog !736 2024-04-06 20:53:56 +01:00
Zedifus
c1c5b5b989 Merge branch 'dev' into bugfix/backup-restore-uuid 2024-04-06 20:52:14 +01:00
Iain Powrie
02cbffb8a1 Merge branch 'bugfix/fixing-rework-id-issue' into 'dev'
Fix migrator issues when jumping versions

See merge request crafty-controller/crafty-4!734
2024-04-06 19:42:10 +00:00
Zedifus
b34e0c813e Update changelog !734 2024-04-06 20:38:29 +01:00
Zedifus
7c3eae66fc Merge branch 'dev' into bugfix/fixing-rework-id-issue 2024-04-06 20:25:16 +01:00
Zedifus
20d5f85602 Increase max versions returned 2024-04-06 20:20:45 +01:00
amcmanu3
afb7575398 Fix API perms request returning stack 2024-04-06 15:05:26 -04:00
amcmanu3
5f00f9d6fa Add full access translation 2024-04-06 13:53:38 -04:00
amcmanu3
9bed7092d6 Check for API permission as well as user permission 2024-04-06 13:42:41 -04:00
amcmanu3
46970e1283 Make dash button more noticable 2024-04-06 11:39:06 -04:00
Zedifus
cc67ebef76 A further clean up and refactor of server jars cache logic
Reordered code, and tidy'd based on DRY (Don't Repeat Yourself)
2024-04-06 01:38:45 +01:00
Zedifus
0fab5cd0f3 Refactor for temporary hardcoded types, use new health check response.
api.serverjars.com not providing fetchTypes route currently,
Will revert when available.
NOTE: New api does not incl Spigot / Bukkit. Announce this.
2024-04-05 20:01:37 +01:00
Zedifus
0c1b81faca Merge branch 'dev' into tweak/error-return 2024-04-03 00:56:50 +01:00