Commit Graph

1330 Commits

Author SHA1 Message Date
Andrew
1bf40ffda9 Fix task update polling
Fix task update polling after a change while linting broke it :/
2022-03-04 20:41:27 -05:00
Andrew
d36a06667e Merge branch 'bug/files-cursor' into 'dev'
Fix cursor showing as text highlight not hand

See merge request crafty-controller/crafty-commander!186
2022-03-04 23:53:36 +00:00
Iain Powrie
7f8960aed3 Merge branch 'staff/credits-update-leo' into 'dev'
Staff/credits update leo

See merge request crafty-controller/crafty-commander!184
2022-03-04 23:53:14 +00:00
Zedifus
5e4eaab54f Correct leo's credit file 2022-03-04 23:40:58 +00:00
Zedifus
a3656536b5 Remove '*' Prefix from joke languages
Co-authored-by: Andrew McManus <amcmanus@arcadiatech.org>
2022-03-04 23:38:36 +00:00
Andrew
55852de3d9 Fix cursor showing as text highlight not hand 2022-03-04 17:58:18 -05:00
Andrew
cd33383cd2 Merge branch 'dev-FixingIconCrash' into 'dev'
Dev fixing icon crash

See merge request crafty-controller/crafty-commander!185
2022-03-04 22:45:14 +00:00
Andrew
e1f1b81838 Merge branch 'dev-FixingIconCrash' of https://gitlab.com/crafty-controller/crafty-commander into dev-FixingIconCrash 2022-03-04 17:30:48 -05:00
Andrew
0775e28e56 Fix error thrown when no icon is available 2022-03-04 17:30:17 -05:00
Silversthorn
319361bd3a Fixing Icon error on GET 2022-03-04 21:30:45 +00:00
Silversthorn
9699bedf39 Update French Translation 2022-03-04 21:34:55 +01:00
Silversthorn
843c16bbd7 Fixing icon bug 2022-03-04 21:09:13 +01:00
Andrew
a76833b409 Optimize looping for server list nav 2022-03-04 12:42:12 -05:00
amcmanu3
db06eca12e ensure icon key exists to prevent stack 2022-03-03 23:59:17 -05:00
amcmanu3
0a08324963 Fix server reordering 2022-03-03 22:25:30 -05:00
amcmanu3
bbd4335d79 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 2022-03-03 22:22:08 -05:00
amcmanu3
4a32744211 Fix indent causing server ordering to not work 2022-03-03 22:22:05 -05:00
Andrew
df1c01141a Merge branch 'dev-RefreshStats_Threading' into 'dev'
Performance improvements

See merge request crafty-controller/crafty-commander!182
2022-03-04 01:04:10 +00:00
amcmanu3
d5c623b928 Merge branch 'dev' into dev-RefreshStats_Threading 2022-03-03 19:57:06 -05:00
amcmanu3
dfa9ab40ca Appease the linter 2022-03-03 19:47:49 -05:00
amcmanu3
ab7889914f Bug fixes to ensure player stats display correctly
Add sync indicator to dashboard
2022-03-03 19:41:30 -05:00
Andrew
3373d6035c Merge branch 'download-status' into 'dev'
Add server download status indicator

See merge request crafty-controller/crafty-commander!181
2022-03-04 00:36:36 +00:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Silversthorn
52297829df Putting Jar versions from most recent to oldest 2022-03-03 23:20:55 +01:00
Silversthorn
cb1679806e Seperate refresh statistics for each server
Fixing Broken Things
2022-03-03 23:13:40 +01:00
Silversthorn
d016e0a59a Broke Things 2022-03-03 22:01:12 +01:00
Andrew
6bc5e5b51f Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-03-02 18:35:58 -05:00
Andrew
761653ac25 Increase realtime stats frequency 2022-03-02 18:35:53 -05:00
Iain Powrie
ea2d115b14 Merge branch 'documentation/docker-warnings' into 'dev'
Documentation/docker warnings

See merge request crafty-controller/crafty-commander!180
2022-03-02 21:16:40 +00:00
Iain Powrie
82cbd4d9bc Documentation/docker warnings 2022-03-02 21:16:40 +00:00
Iain Powrie
8da2bcae17 Merge branch 'devops/userns-rootless-container' into 'dev'
Convert container to run as non-root

See merge request crafty-controller/crafty-commander!172
2022-03-02 19:47:41 +00:00
Zedifus
ef37afd630 Update documentation for docker updates 2022-03-02 19:27:42 +00:00
Andrew
5efc3c6dac Merge branch 'clear-comms' into 'dev'
Add unexecuted clear. Add option to compress backups

See merge request crafty-controller/crafty-commander!179
2022-03-02 19:15:46 +00:00
Andrew
6cf778f068 appease the linter 2022-03-02 13:07:00 -05:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Zedifus
69e85faa1a Merge branch 'dev' into devops/userns-rootless-container
[RESOLVED CONFLICTS]
2022-03-02 16:58:48 +00:00
Zedifus
3e39463e27 Fix sighandler args > sig, args defined elsewhere 2022-03-02 16:50:44 +00:00
Zedifus
a871e09994 Appease lint
User args for something
2022-03-02 16:44:30 +00:00
Andrew
fec877db7b Merge branch 'improve-session-lock' into 'dev'
Improve session.lock checking. Add option to disable language files. Add option to compress backups

See merge request crafty-controller/crafty-commander!178
2022-03-02 16:37:30 +00:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05:00
Zedifus
8f0ac0d025 Fix permissions setting on bedrock imports
This is not an issue on java as we dont need the execute perm on .jar's
Requires to be prefix'd octal intager for mask not decimal
2022-03-02 16:22:53 +00:00
Andrew
15610210b9 Fix bug in schedule creation where if interval was days an execption would be thrown for a missing key 2022-03-02 10:49:03 -05:00
Andrew
7707940743 Appease the linter 2022-03-02 10:36:24 -05:00
Andrew
8e874ca997 Add option to disable language files through config.json 2022-03-02 10:30:40 -05:00
Andrew
826d4d081f Improve session.lock checking. 2022-03-02 09:48:03 -05:00
Zedifus
7be5cfa449 Fix config check in wrapper
.gitkeep was making the wrapper think config was present on fresh boot..
Whoops!
2022-03-02 13:28:36 +00:00
Andrew
e711856cc9 Remove docker exemption from root check 2022-03-02 08:12:03 -05:00
Andrew
061f148166 Merge branch 'devops/userns-rootless-container' of https://gitlab.com/crafty-controller/crafty-commander into devops/userns-rootless-container 2022-03-02 08:10:59 -05:00
Andrew
e2f226a6c3 Attempted fix for daemon sigterm by accepting all args in the sigterm handler 2022-03-02 08:10:49 -05:00
Zedifus
c6b3210fdf Add final working docker config, root group 2022-03-02 05:16:45 +00:00