1689 Commits

Author	SHA1	Message	Date
Andrew	3ab57f116c	Merge branch 'dev' into 'refactor/config-json' ... # Conflicts: # app/classes/shared/helpers.py	2022-12-19 22:13:10 +00:00
Zedifus	cffa58da3b	Merge branch 'dev' into bug/zip-server-upload	2022-12-17 00:07:15 +00:00
Andrew	6572dc5e10	Appease the linter	2022-12-16 18:47:36 -05:00
Andrew	8c6bb38224	Fix location of loop check.	2022-12-15 18:58:10 -05:00
Andrew	c74aeb5dde	Fix id mismatch zip upload import	2022-12-15 18:48:15 -05:00
Andrew	551020f738	Create our own check function	2022-12-14 14:54:52 -05:00
Andrew	9f939ae40e	Trying one more thing	2022-12-14 12:24:00 -05:00
Andrew	6f510976f0	Attempting to add method for posixpath	2022-12-14 12:21:04 -05:00
Andrew	ac1b94d35b	Change Path return PosixPath to purepath	2022-12-14 12:02:38 -05:00
Zedifus	0bdd01f668	Merge branch 'dev' into bug/server-import-copy-loop	2022-12-07 14:32:03 +00:00
Zedifus	94d7b9901c	Merge branch 'dev' into bug/public-backgrounds	2022-12-07 14:09:30 +00:00
Zedifus	c2f086554c	Merge branch 'dev' into bug/status-page-colors	2022-12-07 13:44:53 +00:00
Zedifus	d127fc6e3d	Merge branch 'dev' into bug/plus-sign-path	2022-12-07 13:33:19 +00:00
Andrew	98da08bde6	Appease the linter	2022-12-06 15:11:36 -05:00
Andrew	55c527bfdb	Be sure a user cannot server import crafty dir	2022-12-06 15:09:11 -05:00
Andrew	b133a7bdea	Fix background key not on public pages	2022-12-03 20:48:22 -05:00
Andrew	4baaec8752	Fix colors on public pages.	2022-12-02 13:06:10 -05:00
Andrew	48a6f98cb5	Fix port not showing on dash while server online	2022-11-30 21:50:55 -05:00
Andrew	0c9ee0e0e0	Fix plus sign in path bug with downloads & uploads	2022-11-30 20:28:24 -05:00
Zedifus	17744b72ae	Prepare 4.0.19 release base	2022-12-01 01:18:40 +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
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
Zedifus	4543fcd03f	Merge branch 'dev' into feature/custom-login-background	2022-11-30 21:08:53 +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
Zedifus	1addde000c	Merge branch 'dev' into feature/forge-install	2022-11-30 19:53:16 +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	48b8b9d084	Merge branch 'dev' into refactor/config-json	2022-10-23 21:30:41 +01: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	5a2dc555f8	Merge branch 'dev' into feature/log-filter	2022-10-22 20:45:24 +01:00
Zedifus	ba968cfd71	Merge branch 'dev' into bug/backup-refresh	2022-10-22 20:39:05 +01:00
Zedifus	1f842574c4	Merge branch 'dev' into tweak/stats-clients	2022-10-22 20:26:18 +01:00
Zedifus	eb617bb292	Merge branch 'dev' into feature/update-url-autoset	2022-10-22 20:14:41 +01:00
Zedifus	1f2ff2345d	Rename functions for readability	2022-10-22 19:43:59 +01:00
Zedifus	2599658321	Fix word list display on page load ... Whoopsie	2022-10-22 19:37:16 +01:00