amcmanu3
|
83834286fb
|
Fix creation aesthetic
|
2022-09-04 18:27:45 -04:00 |
|
amcmanu3
|
e3cf2765f0
|
Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev
|
2022-09-04 18:01:03 -04:00 |
|
amcmanu3
|
ab2e8cde0f
|
Fix formatting on server creation page.
|
2022-09-04 18:01:00 -04:00 |
|
Iain Powrie
|
3715dad06f
|
Merge branch 'tweak/update-notifs' into 'dev'
Fix start server after updates
See merge request crafty-controller/crafty-4!449
|
2022-09-04 21:56:18 +00:00 |
|
amcmanu3
|
76a499f5a4
|
Fix start server after updates
Fix update notifs
|
2022-09-04 17:50:08 -04:00 |
|
Iain Powrie
|
1ca34948cc
|
Merge branch 'bug/mc-ping-traceback' into 'dev'
Wrap sock.recv in try/execpt to stop failure
See merge request crafty-controller/crafty-4!444
|
2022-09-04 20:56:34 +00:00 |
|
Zedifus
|
469428d48d
|
Update changelog !444
|
2022-09-04 21:52:33 +01:00 |
|
Zedifus
|
b0403a0b1f
|
Merge branch 'dev' into bug/mc-ping-traceback
|
2022-09-04 21:51:50 +01:00 |
|
Iain Powrie
|
e4b4cc6027
|
Merge branch 'tweak/password-reset' into 'dev'
Make password resets not case sensitive
See merge request crafty-controller/crafty-4!447
|
2022-09-04 20:47:26 +00:00 |
|
Zedifus
|
6dbe92fb90
|
Update changelog !447
|
2022-09-04 21:42:27 +01:00 |
|
Zedifus
|
385ceb9655
|
Merge branch 'dev' into tweak/password-reset
|
2022-09-04 21:41:27 +01:00 |
|
Iain Powrie
|
2e5f239c84
|
Merge branch 'enhancement/metrics-range' into 'dev'
Add ability to change metrics scale
See merge request crafty-controller/crafty-4!448
|
2022-09-04 20:34:27 +00:00 |
|
Zedifus
|
dd0f609d0c
|
Update changelog !448
|
2022-09-04 21:31:10 +01:00 |
|
Zedifus
|
0bce6f432a
|
Merge branch 'dev' into enhancement/metrics-range
|
2022-09-04 21:25:45 +01:00 |
|
amcmanu3
|
e9c74be057
|
Add ability to change metrics scale
|
2022-09-04 16:21:33 -04:00 |
|
Iain Powrie
|
aaad44bb40
|
Merge branch 'feature/bedrock-creation' into 'dev'
Add Bedrock Server Creation
See merge request crafty-controller/crafty-4!443
|
2022-09-04 20:19:27 +00:00 |
|
Zedifus
|
37bc41b207
|
Update changelog !443
|
2022-09-04 21:14:05 +01:00 |
|
Zedifus
|
7f95f7085d
|
Merge branch 'dev' into feature/bedrock-creation
|
2022-09-04 21:12:47 +01:00 |
|
Iain Powrie
|
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 |
|
Zedifus
|
9a118def24
|
Update changelog !441
|
2022-09-04 21:05:02 +01:00 |
|
Zedifus
|
88d3facc80
|
Merge branch 'dev' into enhancement/bedrock-update-support
|
2022-09-04 21:03:31 +01:00 |
|
amcmanu3
|
ceab737667
|
Update requirement checking for password reset
|
2022-09-04 14:22:25 -04:00 |
|
amcmanu3
|
a6148a7d8a
|
Make password username lowercase
|
2022-09-04 13:33:22 -04:00 |
|
Iain Powrie
|
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 |
|
Zedifus
|
3143a6c637
|
Update changelog !446
|
2022-09-04 03:13:18 +01:00 |
|
Zedifus
|
dd6366cb63
|
Retrieve updater artifact and include in package
|
2022-09-04 03:13:18 +01:00 |
|
Andrew
|
dd56b4be37
|
update updates
|
2022-09-03 13:42:30 -04:00 |
|
Andrew
|
1f95ad600c
|
Add return
|
2022-09-03 13:26:51 -04:00 |
|
Andrew
|
5d688522bd
|
Fix backup logic
|
2022-09-03 13:23:30 -04:00 |
|
Andrew
|
6559112e1b
|
Fix update logic
|
2022-09-03 13:16:03 -04:00 |
|
Andrew
|
9a7a1cc5d8
|
Change elif to else
|
2022-09-03 12:46:35 -04:00 |
|
Iain Powrie
|
3bdaec7837
|
Apply 1 suggestion(s) to 1 file(s)
|
2022-09-03 16:40:59 +00:00 |
|
Iain Powrie
|
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 |
|
Zedifus
|
eeadea9706
|
Update changelog !442
|
2022-09-02 13:28:33 +01:00 |
|
Zedifus
|
77a858f24e
|
Merge branch 'dev' into bug/import3-servers
|
2022-09-02 13:27:00 +01:00 |
|
Iain Powrie
|
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 |
|
Zedifus
|
6d2055afe3
|
Update changelog !440
|
2022-09-02 13:19:46 +01:00 |
|
amcmanu3
|
d568b7c664
|
Fix EULA message for legal reasons
Make EULA message look prettier
|
2022-09-01 14:18:04 -04:00 |
|
amcmanu3
|
99979f668b
|
Fix black formatting
|
2022-09-01 12:51:54 -04:00 |
|
amcmanu3
|
d5ecfe9128
|
Add spinner to update button
|
2022-09-01 12:46:37 -04:00 |
|
Iain Powrie
|
3e370c0ae4
|
Apply 1 suggestion(s) to 1 file(s)
|
2022-09-01 14:41:42 +00:00 |
|
Andrew
|
0bc7e584e0
|
Wrap sock.recv in try/execpt to stop failure
|
2022-09-01 10:29:47 -04:00 |
|
amcmanu3
|
2becb657ca
|
Put try/except around creation
|
2022-08-31 20:01:38 -04:00 |
|
amcmanu3
|
bd38fcd6e4
|
Add try/except around download
|
2022-08-31 19:59:46 -04:00 |
|
amcmanu3
|
a07eb58db7
|
Add bedrock server creation
|
2022-08-31 19:45:19 -04:00 |
|
amcmanu3
|
b274f0d3b0
|
Remove update url from config
|
2022-08-31 19:36:43 -04:00 |
|
amcmanu3
|
b445d085c8
|
Fix no id on import3 servers
|
2022-08-31 16:11:49 -04:00 |
|
Zedifus
|
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 |
|
Zedifus
|
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 |
|
Zedifus
|
fdf1a5a41d
|
Add url helper to bedrock update
|
2022-08-31 19:46:07 +01:00 |
|