Commit Graph

3774 Commits

Author SHA1 Message Date
Iain Powrie
6bf03d5c33 Merge branch 'bugfix/clone-server' into 'dev'
Do not allow users at server limit to clone servers

See merge request crafty-controller/crafty-4!718
2024-02-20 03:15:11 +00:00
Zedifus
0c16e99925 Update changelog !718 2024-02-20 03:10:26 +00:00
Zedifus
5b2890ce9a Merge branch 'dev' into bugfix/clone-server 2024-02-20 03:08:33 +00:00
Iain Powrie
f9dc4083b9 Merge branch 'bugfix/default-json' into 'dev'
Make sure default.json is read from correct loc

See merge request crafty-controller/crafty-4!714
2024-02-20 03:07:51 +00:00
Zedifus
6495e46adc Update changelog !714 2024-02-20 02:59:18 +00:00
Zedifus
5e85707973 Merge branch 'dev' into bugfix/default-json 2024-02-20 02:58:09 +00:00
Andrew
51ef227565 Merge branch 'tweak/fix-bedrock-cert-issues' into 'dev'
Fix bedrock cert issues & Refactor Remote downloads

See merge request crafty-controller/crafty-4!719
2024-02-20 02:53:36 +00:00
Zedifus
d886fe7965 Update changelog !719 2024-02-20 02:48:54 +00:00
amcmanu3
db8ef6d382 Fix modal glitch 2024-02-19 21:45:11 -05:00
amcmanu3
975dd2f967 Allow super users to clone to their hearts desire
Add same roles for cloned server
2024-02-19 21:45:05 -05:00
Zedifus
25a46a250b Make paper url fetching more robust
Resolves traceback:
build = self.get_paper_build(server, version).get("build")
AttributeError: 'NoneType' object has no attribute 'get'
2024-02-20 02:27:54 +00:00
Zedifus
aec58fdca3 Refactor Crafty remote file downloads 2024-02-20 01:19:39 +00:00
amcmanu3
e053f4a750 Check server creation for clone server call 2024-02-19 18:07:17 -05:00
Andrew
1211b22183 Merge branch 'sec/bump-crypto' into 'dev'
Bump openssl & cryptography

See merge request crafty-controller/crafty-4!716
2024-02-19 20:43:20 +00:00
Zedifus
07c9620875 Merge branch 'dev' into sec/bump-crypto 2024-02-19 20:34:49 +00:00
Andrew
d19d3a2288 Merge branch 'tweak/appease-black-in-dev' into 'dev'
Fix assorted black issues currently in dev

See merge request crafty-controller/crafty-4!717
2024-02-19 20:27:31 +00:00
Zedifus
0422a2ecdf Fix assorted black issues currently in dev 2024-02-19 20:02:09 +00:00
Zedifus
bbf08a6690 Update changelog !716 2024-02-19 19:58:31 +00:00
Zedifus
c570bdeda0 Bump openssl & cryptography
Resolves:
CVE-2024-0727
CVE-2023-50782
2024-02-19 19:30:51 +00:00
Andrew
879aa8c54c Make sure default.json is read from correct loc 2024-02-15 07:15:53 -05:00
Zedifus
8e199dcd67 Prepare 4.2.4 release base 2024-02-02 23:35:09 +00:00
Zedifus
ba94e828c6 Close changelog v4.2.3 2024-02-02 23:00:01 +00:00
Zedifus
50e65f6531 Fix hardcoded banner issue from !703 2024-02-02 22:41:07 +00:00
Iain Powrie
4f715ba614 Merge branch 'tweak/anti-lockout' into 'dev'
Remove ability to move to create server | Add logging

See merge request crafty-controller/crafty-4!706
2024-02-02 22:17:53 +00:00
Zedifus
4309abecbb Update changelog !706 2024-02-02 22:12:39 +00:00
Zedifus
c49258d573 Merge branch 'dev' into tweak/anti-lockout 2024-02-02 22:07:30 +00:00
Iain Powrie
a28dadaa0e Merge branch 'bugfix/fixing-motd-issue' into 'dev'
Fixing issue 322

See merge request crafty-controller/crafty-4!705
2024-02-02 22:05:22 +00:00
Zedifus
16e9124e92 Update changelog !705 2024-02-02 21:58:47 +00:00
Zedifus
ed3b43705c Merge branch 'dev' into bugfix/fixing-motd-issue 2024-02-02 21:55:38 +00:00
Iain Powrie
7ee0a13014 Merge branch 'enhancement/improve-minor-displays' into 'dev'
Improve Minor Displays

See merge request crafty-controller/crafty-4!703
2024-02-02 21:53:29 +00:00
Zedifus
f86efbd57e Fix changelog !703 2024-02-02 21:44:48 +00:00
Zedifus
fdba7bb0c7 Update changelog !703 2024-02-02 21:25:55 +00:00
Zedifus
1fe749d617 Merge branch 'dev' into enhancement/improve-minor-displays 2024-02-02 21:13:59 +00:00
Iain Powrie
e6494106a9 Merge branch 'tweak/http-timeout' into 'dev'
HTTP Timeout

See merge request crafty-controller/crafty-4!704
2024-02-02 20:51:32 +00:00
Zedifus
798a9524d7 Update changelog !704 2024-02-02 20:45:28 +00:00
Zedifus
559e5f44ee Merge branch 'dev' into tweak/http-timeout 2024-02-02 20:41:59 +00:00
Zedifus
a3236d72fd Correct nh3 no-member exemptions affected by black formatting 2024-02-02 20:36:04 +00:00
Iain Powrie
d4e158ad21 Merge branch 'devops/diagnose-lint-pipeline' into 'dev'
Install packages in pylint analysis job

See merge request crafty-controller/crafty-4!708
2024-02-02 20:12:11 +00:00
Zedifus
ef691eda5c Add exclude for E1101: Module 'nh3' has no 'clean' member
--False Positive--
Issue tracking (fix planned for pylint 4.0.0)
https://github.com/messense/nh3/issues/18
https://github.com/pylint-dev/pylint/issues/8756
2024-02-02 19:51:17 +00:00
Silversthorn
23ba911686 Fixing same size text everywhere 2024-02-02 20:37:07 +01:00
Zedifus
75f918fe13 Add deps for wheel build 2024-02-02 19:23:34 +00:00
Zedifus
be4c7b53f9 Install packages in pylint analysis job 2024-02-02 19:11:18 +00:00
Iain Powrie
bbbb83f9c8 Merge branch 'devops/unpin-pylint' into 'dev'
Unpin pipeline-components pylint

See merge request crafty-controller/crafty-4!707
2024-02-02 18:16:26 +00:00
Zedifus
6e97f4ed50 Unpin pipeline-components pylint 2024-02-02 18:02:59 +00:00
Iain Powrie
6d29ee23d0 Merge branch 'tweak/unsupported-mc' into 'dev'
Add warning to wizard for unsupported mc

See merge request crafty-controller/crafty-4!701
2024-02-02 18:00:25 +00:00
Zedifus
de60b88d90 Update changelog !701 2024-02-02 17:56:25 +00:00
Zedifus
dc13706a02 Merge branch 'dev' into tweak/unsupported-mc 2024-02-02 17:53:02 +00:00
Analicia A.
9a667b02a4 Updated for 4.2.3 2024-02-02 16:47:59 +00:00
Analicia Abernathy
7b598406be Added loadingMotd translation for 4.2.3 2024-02-01 18:17:34 -06:00
Andrew
5c37b0e0fd Add auth logging 2024-02-01 00:08:34 -05:00