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
3,980 Commits 12 Branches 45 Tags 104 MiB
367e77765c
Commit Graph

3980 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
amcmanu3
166e3c5088 Black codebase 2024-02-19 12:03:02 -05:00
Andrew
f6bb6eafcd Add default path password check 
Change decode to utf-8
 2024-02-17 23:08:23 -05:00
Andrew
d673908ce4 Encode password base64 to server 2024-02-17 22:33:50 -05:00
Silversthorn
3bd5de5bf6 update cryptography in requirements.txt too fix vulnerability 2024-02-16 20:36:22 +01:00
Silversthorn
3529c9f7fe Fixing loog messages 2024-02-16 20:27:30 +01:00
Silversthorn
b30d7b627c removing uuid from server model 2024-02-16 20:23:23 +01:00
Silversthorn
12627cec8e Fixed the why it was not working 2024-02-16 20:21:38 +01:00
Silversthorn
90e0777b9b try to revert back to old migrate history if failed 2024-02-16 20:04:12 +01:00
Silversthorn
875c9058b0 there were still use -_- 2024-02-16 19:46:22 +01:00
Silversthorn
bb3901f783 remove forgoten use of migration_uuid 2024-02-16 19:45:08 +01:00
Silversthorn
ccec2a3400 rename migration file to have a more recent one 2024-02-16 19:32:23 +01:00
Silversthorn
ad6e53a5d1 Adding all migration steps to a migration.py file 2024-02-16 19:29:14 +01:00
Andrew
879aa8c54c Make sure default.json is read from correct loc 2024-02-15 07:15:53 -05:00
Silversthorn
a7f7a50ae0 really fixing the bug 2024-02-09 00:22:42 +01:00
Silversthorn
1b05562a9e Fix Forge Install bug for 1.20, 1.20.1 and 1.20.2 2024-02-09 00:10:26 +01:00
Silversthorn
2eb0eb59ef Merge branch 'dev' into refactor/server_ids 2024-02-03 21:12:39 +01: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
0a3512a18e Merge branch 'dev' into refactor/server_ids 2024-02-02 20:50:08 +01: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