Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,492 Commits 12 Branches 45 Tags 104 MiB
5d3badef2c
Commit Graph

88 Commits

Author SHA1 Message Date
Andrew
5d3badef2c Cleanup temp dirs on support log creation 2022-06-01 17:54:58 -04:00
luukas
0d62223982 Merge branch 'dev' into bugfix/api-v2-bugfixes 2022-05-23 20:20:49 +03:00
luukas
02f5318f76
Merge branch 'dev' into merge/pretzel-lukas-cleanup-nosquash 2022-05-20 22:04:41 +03:00
luukas
dba3fafa87
Use shorthand for Controller.check_system_user 
This reduced the code from 4 lines to 1 line.

The code
    if <condition>:
        return True
    else:
        return False
can be shortened to
    return <condition>
 2022-05-20 13:31:30 +03:00
luukas
48948423c9
Fix various things in create_api_server 2022-05-20 01:33:02 +03:00
luukas
7a7c7501e6 Use relative path for latest.log 2022-05-19 17:27:36 +03:00
luukas
559a345f25 Merge branch 'dev' into merge/api-v2 2022-05-18 01:49:19 +03:00
luukas
821ed7ef5d Make get_server_obj raise an error 
Reason being: There is nothing that checks if it returns False
 2022-05-17 21:43:15 +03:00
Andrew
490fc86d4e Cleanup server schedule on delete 2022-05-15 14:00:24 -05:00
Andrew
e161e2cf0b Add cleanup method for server stats on delete 2022-05-15 13:28:02 -05:00
luukas
930c6936d9 Add more advanced role APIs 2022-05-10 02:08:49 +03:00
luukas
721c9cfe12 Add the server creation endpoint 2022-05-05 14:02:23 +03:00
Andrew
77bbde149a Fix fresh install side effects from DB rework 2022-04-17 13:27:00 -04:00
Zedifus
92c8fc04f3 Refactor to standardize class/variable naming ✨ 2022-04-14 03:10:25 +01:00
Andrew
64d2e5fedd Appease the linter 2022-04-12 19:54:35 -04:00
Andrew
705da450e7 Fix bug where roles could not be deleted. 2022-04-12 17:58:59 -04:00
computergeek125
d417950eae fix fstrings, refactored console to static 2022-04-11 20:34:46 -05:00
Zedifus
19f2429a4c Fix formatting to comply with ⬛Black 2022-04-11 11:08:36 +01:00
computergeek125
42ca4bb973 Refactored the yes to not pass objects in import 
Merge Conflicts ᴙ Us
 2022-04-11 00:23:55 -05:00
Zedifus
2a512d7273 Fix files to conform with new ⚫Black pylintrc 
Mostly just breaking up strings and comments into new lines
Some strings dont require 'f' but keeping in for readability
with the rest of the concatinated string
 2022-03-23 06:06:13 +00:00
Zedifus
e06fe8a52a ⬛Black codebase 
Apply black formatting to codebase
 2022-03-23 02:50:12 +00:00
amcmanu3
0f27b2df91 Fix error where user could not create server 
Fix error where user could not create support files
 2022-03-14 17:39:19 -04:00
Andrew
d4a1efba78 Appease the linter 2022-03-13 09:26:38 -04:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Zedifus
b306d1f313 Tidy imports & dep auto-installer 2022-03-08 04:40:44 +00:00
amcmanu3
9520858c22 Fix backup restore 2022-03-07 21:36:23 -05:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +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
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
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
amcmanu3
e99f06ba9f remove print statement 2022-03-01 19:57:02 -05:00
Andrew
00db762c51 Add check in server import so we don't stack if jar doesn't exist. 2022-03-01 19:29:08 -05:00
Andrew
c8c1f301c0 Fix server importing for bedrock that's not a zip 2022-03-01 18:31:38 -05:00
Andrew
5d6ada23a4 Fix visual file loading order. Fix zip imports where directories were not being copied 2022-03-01 16:54:06 -05:00
xithical
c4f706d415 Rework of files handling and added exclusions selection for backups. 2022-03-01 01:02:30 +00:00
Andrew
1ab4ffd8f7 Add execution command for bedrock server jar 2022-02-26 12:42:01 -05:00
Andrew
59ea0a326d Add a / for execution 2022-02-26 12:35:23 -05:00
Andrew
c625781da8 Fix typo in main_controller 2022-02-26 12:14:41 -05:00
Andrew
f3d5f4f454 Fix Bedrock for linux 2022-02-26 12:12:02 -05:00
Andrew
569876e377 Remove useless print statement 2022-02-10 18:46:26 -05:00
Andrew
b55af70d11 Appease the linter 2022-02-10 18:29:43 -05:00
Andrew
540584990e Inital bedrock support 2022-02-10 18:20:36 -05:00
Andrew
c89609ae61 Inital bedrock support 2022-02-10 15:27:40 -05:00
Andrew
3995560ba2 Enable/disable crash detection on setting change in config 2022-01-30 21:04:08 -05:00
Iain Powrie
e0ce1d118c Create pylintrc, code review pipeline & correct codebase errors 
Fix uploads,
Only send server stats to user page when they have access to servers
 2022-01-26 01:45:30 +00:00
Silversthorn
bae08d05d9 Merge branch 'dev' into dev_websocket_server_status 2022-01-21 23:54:59 +01:00
Andrew
2f3110b107 fix server deleting function due to type error after JWT merge. 2022-01-19 18:28:08 -05:00
Andrew
285a4ff9b4 fix error with logging so we can try to find out what's going on with windows servers not starting 2022-01-19 17:23:04 -05:00