Commit Graph

2845 Commits

Author SHA1 Message Date
cf5e4f61bf Merge branch 'enhancement/bedrock-update-support' into 'dev'
Fix executable backups for Bedrock

See merge request crafty-controller/crafty-4!441
2022-09-04 20:09:04 +00:00
9a118def24 Update changelog !441 2022-09-04 21:05:02 +01:00
88d3facc80 Merge branch 'dev' into enhancement/bedrock-update-support 2022-09-04 21:03:31 +01:00
ceab737667 Update requirement checking for password reset 2022-09-04 14:22:25 -04:00
a6148a7d8a Make password username lowercase 2022-09-04 13:33:22 -04:00
5992aab250 Merge branch 'devops/add_updater_to_win_package' into 'dev'
Retrieve updater artifact and include in package

See merge request crafty-controller/crafty-4!446
2022-09-04 02:17:57 +00:00
3143a6c637 Update changelog !446 2022-09-04 03:13:18 +01:00
dd6366cb63 Retrieve updater artifact and include in package 2022-09-04 03:13:18 +01:00
dd56b4be37 update updates 2022-09-03 13:42:30 -04:00
1f95ad600c Add return 2022-09-03 13:26:51 -04:00
5d688522bd Fix backup logic 2022-09-03 13:23:30 -04:00
6559112e1b Fix update logic 2022-09-03 13:16:03 -04:00
9a7a1cc5d8 Change elif to else 2022-09-03 12:46:35 -04:00
3bdaec7837 Apply 1 suggestion(s) to 1 file(s) 2022-09-03 16:40:59 +00:00
ed647604ba Merge branch 'bug/import3-servers' into 'dev'
Fix no id on import3 servers

See merge request crafty-controller/crafty-4!442
2022-09-02 12:32:48 +00:00
eeadea9706 Update changelog !442 2022-09-02 13:28:33 +01:00
77a858f24e Merge branch 'dev' into bug/import3-servers 2022-09-02 13:27:00 +01:00
06267042cb Merge branch 'bug/metrics' into 'dev'
Fix metrics schedule lag

See merge request crafty-controller/crafty-4!440
2022-09-02 12:25:02 +00:00
6d2055afe3 Update changelog !440 2022-09-02 13:19:46 +01:00
d568b7c664 Fix EULA message for legal reasons
Make EULA message look prettier
2022-09-01 14:18:04 -04:00
99979f668b Fix black formatting 2022-09-01 12:51:54 -04:00
d5ecfe9128 Add spinner to update button 2022-09-01 12:46:37 -04:00
3e370c0ae4 Apply 1 suggestion(s) to 1 file(s) 2022-09-01 14:41:42 +00:00
0bc7e584e0 Wrap sock.recv in try/execpt to stop failure 2022-09-01 10:29:47 -04:00
2becb657ca Put try/except around creation 2022-08-31 20:01:38 -04:00
bd38fcd6e4 Add try/except around download 2022-08-31 19:59:46 -04:00
a07eb58db7 Add bedrock server creation 2022-08-31 19:45:19 -04:00
b274f0d3b0 Remove update url from config 2022-08-31 19:36:43 -04:00
b445d085c8 Fix no id on import3 servers 2022-08-31 16:11:49 -04:00
96c4fa3bdd Validate bedrock url before download with urllib
Even though there will be an incredibly small chance of tampering
this is to make bandit happy
"Bandit Test ID B310"
https://stackoverflow.com/a/53040523/18355876
2022-08-31 20:04:39 +01:00
0c9e10f18a Fix sec overly permissive file permissions
775 is too permissive for this  file, '-rwxr--r--' is more than enough
B103: Test for setting permissive file permissions
https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html
2022-08-31 19:50:35 +01:00
fdf1a5a41d Add url helper to bedrock update 2022-08-31 19:46:07 +01:00
9350ed07d7 Add bedrock remote url helper 2022-08-31 19:04:04 +01:00
0f820433f1 Remove log path from config for bedrock 2022-08-31 12:39:52 -04:00
600de2be0c Fix executable backups
Cleanup after ourselves
2022-08-31 12:18:52 -04:00
266e540374 Add bedrock update support 2022-08-31 11:59:33 -04:00
7f412954d7 Fix metrics schedule lag 2022-08-30 17:27:19 -04:00
cb1490724c Merge branch 'master' into dev 2022-08-28 01:19:37 +01:00
9f62f6d0ca Prepare 4.0.12 release base 2022-08-28 01:17:55 +01:00
5af3c30aa5 Merge branch 'dev' into 'master'
4.0.11

See merge request crafty-controller/crafty-4!439
v4.0.11-beta
2022-08-28 00:13:41 +00:00
14b2891e1c Tidy 4.0.11 changelog 2022-08-27 20:58:52 +00:00
ee71e48035 Merge branch 'tweak/support-logs-zip-comment' into 'dev'
Add Zip comments to support archives

See merge request crafty-controller/crafty-4!438
2022-08-27 19:15:49 +00:00
381648eaca Update changelog !438 2022-08-27 19:01:41 +01:00
51d123e9eb Merge branch 'dev' into tweak/support-logs-zip-comment 2022-08-27 19:00:38 +01:00
619a760482 Merge branch 'devops/bedrock-docker-deps-update' into 'dev'
Add bedrock dependency (libcurl.so.4)

See merge request crafty-controller/crafty-4!437
2022-08-27 17:18:43 +00:00
33051e522b Update changelog !437 2022-08-27 18:13:45 +01:00
b174d43851 Merge branch 'dev' into devops/bedrock-docker-deps-update 2022-08-27 18:12:22 +01:00
9876f37c85 Merge branch 'feature/pretzel-metrics-graph' into 'dev'
Add metrics graph

See merge request crafty-controller/crafty-4!436
2022-08-27 17:08:01 +00:00
ab248bb006 Update changelog !436 2022-08-27 18:02:03 +01:00
fdb98cf1f8 Merge branch 'dev' into feature/pretzel-metrics-graph 2022-08-27 18:00:36 +01:00