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,844 Commits 12 Branches 45 Tags 104 MiB
e0bb2eaaa0
Commit Graph

3844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
e0bb2eaaa0 Merge branch 'dev' into refactor/server_ids 2024-03-03 01:32:44 +00:00
Iain Powrie
1bb87de8e3 Merge branch 'sec/bump-cryptography' into 'dev' 
Bump cryptography

See merge request crafty-controller/crafty-4!724
 2024-03-03 01:06:30 +00:00
Zedifus
f8b3c64105 Update changelog !724 2024-03-03 00:27:24 +00:00
Zedifus
8268a769ee Bump cryptography for CVE-2024-26130 2024-03-03 00:26:23 +00:00
Iain Powrie
d58df77ad7 Merge branch 'bugfix/bedrock-download' into 'dev' 
Fix bedrock url

See merge request crafty-controller/crafty-4!723
 2024-03-03 00:11:37 +00:00
Zedifus
270f330848 Update changelog !723 2024-03-03 00:04:17 +00:00
Zedifus
3d5a370040 Merge branch 'dev' into bugfix/bedrock-download 2024-03-02 23:59:48 +00:00
Iain Powrie
9e5dc7d89f Merge branch 'bugfix/select-root' into 'dev' 
Fix root dir filename space

See merge request crafty-controller/crafty-4!722
 2024-03-02 23:52:01 +00:00
Zedifus
2b2926a100 Update changelog !722 2024-03-02 23:47:14 +00:00
Zedifus
03a5871c79 Merge branch 'dev' into bugfix/select-root 2024-03-02 23:44:03 +00:00
Iain Powrie
2e342f211b Merge branch 'tweak/linux-perms' into 'dev' 
Add linux perms script

See merge request crafty-controller/crafty-4!721
 2024-03-02 23:37:02 +00:00
Iain Powrie
cb5d0f46f8 Merge branch 'bugfix/password-encode' into 'dev' 
Fix Sanitisation on Passwords

See merge request crafty-controller/crafty-4!715
 2024-03-02 23:30:20 +00:00
Zedifus
a9f2ea0a14 Update changelog !715 2024-03-02 23:24:34 +00:00
Zedifus
f98dbb9332 Merge branch 'dev' into bugfix/password-encode 2024-03-02 23:16:40 +00:00
Iain Powrie
b30e882e17 Merge branch 'bugfix/fix-forge-install' into 'dev' 
Fix forge install v1.20, 1.20.1 and 1.20.2

See merge request crafty-controller/crafty-4!710
 2024-03-02 23:09:07 +00:00
Zedifus
9134f19a43 Update changelog !710 2024-03-02 22:53:55 +00:00
Zedifus
49fce1b5c4 Merge branch 'dev' into bugfix/fix-forge-install 2024-03-02 22:51:44 +00:00
amcmanu3
9f524ff113 Too many www's 2024-03-02 17:00:52 -05:00
amcmanu3
6e28da4195 Fix bedrock url 2024-03-02 16:53:17 -05:00
Analicia Abernathy
440dee7ef5 really fixed polish translation 2024-02-23 09:01:40 -06:00
Analicia Abernathy
1ead20b9b5 updated Ukranian translation 2024-02-23 07:45:23 -06:00
Analicia Abernathy
5fc24f2253 updated thai translation 2024-02-23 07:45:00 -06:00
Analicia Abernathy
5a019c0f27 updated dutch translation 2024-02-23 07:44:41 -06:00
Analicia Abernathy
85a6fca65d updated polish translation 2024-02-23 07:44:10 -06:00
amcmanu3
fdf3221754 Fix bug where unix installs could not have a space in file name 2024-02-22 20:21:54 +00:00
amcmanu3
69dc7dfedb Update Hebrew translation 2024-02-22 13:06:49 -05:00
amcmanu3
f8f428a8d9 Update french and chinese translations 2024-02-21 20:19:47 -05:00
amcmanu3
669ac63896 Add script to fix linux perms 2024-02-21 20:11:13 -05:00
Silversthorn
303de39226 Merge branch 'dev' into refactor/server_ids 2024-02-21 23:00:21 +01:00
amcmanu3
fb22a753c1 Update de_DE, lol_EN, lv_LV, and tr_TR translations 2024-02-21 15:37:03 -05:00
Zedifus
6759d840f3 Update changelog 900ec15e 2024-02-21 09:20:50 +00:00
amcmanu3
4df7858da6 Fix code quality issues 2024-02-21 00:04:07 -05:00
amcmanu3
900ec15e4c Fix bug where you cannot get to config with unloaded server 2024-02-20 22:30:32 -05:00
amcmanu3
62b55792e5 Update spanish translation 
Sort english translation
 2024-02-20 22:28:29 -05:00
amcmanu3
f4f4f9e0b6 Remove extraneous error messaging 2024-02-20 18:50:32 -05:00
amcmanu3
f6242d6507 Remove username regex 2024-02-20 18:47:00 -05:00
amcmanu3
647e3b1111 Remove encoding 2024-02-20 17:32:34 -05:00
Zedifus
9de08973b6 Fix minor lint issues (formatting) 2024-02-20 03:26:15 +00:00
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
amcmanu3
fcb8b02907 Black codebase 2024-02-19 21:14:28 -05:00