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
2,551 Commits 12 Branches 45 Tags 104 MiB
cf9ad77879
Commit Graph

2551 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zedifus
c47b543840 Update changelog !499 2022-12-01 01:08:28 +00:00
Zedifus
c5a888a2c0 Merge branch 'dev' into tweak/public-background 2022-12-01 01:03:26 +00:00
Andrew
206dc956cf Make background available to all public pages 
Move background to top of html for better loading
 2022-11-30 19:53:10 -05:00
Zedifus
74f71606f3 Prepare 4.0.18 release base 2022-12-01 00:20:18 +00:00
Zedifus
125f662e4e Tweak CL 2022-11-30 23:48:41 +00:00
Iain Powrie
03418dc768 Merge branch 'feature/custom-login-background' into 'dev' 
Add custom login backgrounds

See merge request crafty-controller/crafty-4!494
 2022-11-30 23:37:43 +00:00
Zedifus
36bb3db704 Merge branch 'dev' into feature/custom-login-background 2022-11-30 23:31:39 +00:00
Andrew
6a693fd2ca Merge branch 'feature/custom-login-background' of gitlab.com:crafty-controller/crafty-4 into feature/custom-login-background 2022-11-30 18:14:42 -05:00
Andrew
9bd0bd2f7e Make the zedifus changes. 2022-11-30 18:14:37 -05:00
Iain Powrie
d0f8488ea1 Merge branch 'devops/bump-image-base-to-jammy' into 'dev' 
Docker | Bump ubuntu base

See merge request crafty-controller/crafty-4!497
 2022-11-30 22:09:41 +00:00
Zedifus
f6235ff02b Update changelog !497 2022-11-30 22:03:38 +00:00
Zedifus
01add23f69 Bump ubuntu base 
Removed openjdk 16 as backport for jammy doesn't exist, most functions of 16 are in 17
 2022-11-30 21:50:37 +00:00
Zedifus
2bdd870eaa Update changelog !494 2022-11-30 21:10:44 +00:00
Zedifus
4543fcd03f Merge branch 'dev' into feature/custom-login-background 2022-11-30 21:08:53 +00:00
Iain Powrie
55d924d45f Merge branch 'enhancement/dashboard-port' into 'dev' 
Add port tooltip over status on dash

See merge request crafty-controller/crafty-4!496
 2022-11-30 20:59:22 +00:00
Zedifus
c2077ea978 Update changelog !496 2022-11-30 20:53:21 +00:00
Zedifus
58d32ca4de Merge branch 'dev' into enhancement/dashboard-port 2022-11-30 20:51:52 +00:00
Andrew
b2182919ff Fix dir does not exist. 2022-11-30 15:51:12 -05:00
Iain Powrie
a7fa91b225 Merge branch 'feature/forge-install' into 'dev' 
Automated forge install

See merge request crafty-controller/crafty-4!495
 2022-11-30 20:50:13 +00:00
Zedifus
7ef28777c7 Update changelog !495 2022-11-30 19:54:59 +00:00
Zedifus
1addde000c Merge branch 'dev' into feature/forge-install 2022-11-30 19:53:16 +00:00
Iain Powrie
7fc0bb123d Merge branch 'bug/bedrock-creation' into 'dev' 
Fix no port on bedrock server creation

See merge request crafty-controller/crafty-4!493
 2022-11-30 19:51:26 +00:00
Zedifus
9801266a9c Update changelog !493 2022-11-30 19:47:25 +00:00
Andrew
2782e927d7 Add port tooltip over status on dash 2022-11-28 19:45:53 -05:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05:00
Silversthorn
671a5188c2 Adding French Translations 2022-11-19 23:28:57 +01:00
Silversthorn
b4dca8b27f Merge branch 'feature/forge-install' of gitlab.com:crafty-controller/crafty-4 into feature/forge-install 2022-11-19 23:20:26 +01:00
Silversthorn
004049f6da Using Regex to Extract Infos from Forge Scripts 2022-11-19 23:20:21 +01:00
Andrew
32cdde0616 Fix failed imports 2022-11-19 16:13:44 -05:00
Andrew
4e17c1ea5e Add installing status 2022-11-19 15:45:29 -05:00
Andrew
b95d71bfbc Appease the linter 2022-11-19 14:45:24 -05:00
Andrew
e42af36103 Make sure import status persists through install 2022-11-19 14:41:15 -05:00
Andrew
ad4603aafb Add automated forge server creation installs 2022-11-19 13:45:18 -05:00
amcmanu3
46740f7cbf Fix type error on delete 2022-11-09 14:20:37 -05:00
amcmanu3
bf0255a26b Add custom login image feature 2022-11-09 14:13:35 -05:00
Andrew
a66b95e607 Fix no port on bedrock server creation 2022-10-28 22:16:10 -04:00
Zedifus
cd93b468b3 Prepare 4.0.17 release base 
Also remove badges from README, as gitlab already handles this in a different section
 2022-10-23 21:24:10 +01:00
Zedifus
8c4c8ba995 Repair prod docker build pipe cache reference 
Aswell as another attempt at pushing multiple tags
 2022-10-23 20:24:38 +01:00
Zedifus
c3c8bc178c Repair prod docker build pipe 2022-10-23 19:54:25 +01:00
Iain Powrie
352c6eec61 Merge branch 'dev' into 'master' 
v4.0.16

See merge request crafty-controller/crafty-4!492
 2022-10-23 18:32:05 +00:00
Zedifus
1cbfb6eb10 Update changelog with commit a6aa0f8 
Also change console colour for path display
 2022-10-23 19:02:24 +01:00
Zedifus
a6aa0f8679 Fix pyinstaller pathing 2022-10-23 18:48:23 +01:00
Iain Powrie
2293257f89 Merge branch 'bug/win-root-path' into 'dev' 
Change the way we declare root by pyinstaller docs

See merge request crafty-controller/crafty-4!491
 2022-10-22 19:59:44 +00:00
Zedifus
a85c44989d Update changelog !491 2022-10-22 20:56:49 +01:00
Zedifus
52a1988d3b Merge branch 'dev' into bug/win-root-path 2022-10-22 20:54:13 +01:00
Iain Powrie
695f9dc0a8 Merge branch 'feature/log-filter' into 'dev' 
Add log filtering

See merge request crafty-controller/crafty-4!484
 2022-10-22 19:50:37 +00:00
Zedifus
b8900ab0ea Update changelog !484 2022-10-22 20:47:47 +01:00
Zedifus
5a2dc555f8 Merge branch 'dev' into feature/log-filter 2022-10-22 20:45:24 +01:00
Iain Powrie
bd4a1858c9 Merge branch 'bug/backup-refresh' into 'dev' 
Fix "cannot render after finish" from backup_now

See merge request crafty-controller/crafty-4!489
 2022-10-22 19:44:03 +00:00
Zedifus
1a5728ccf1 Update changelog !489 2022-10-22 20:40:15 +01:00