1531 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
amcmanu3	76cedc9392	Fix stats error on mac M1 chips	2022-12-19 11:54:24 -05:00
Andrew	a1e8b7afe7	Make server directories non-configurable	2022-12-17 12:21:15 -05: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	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
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	0c9ee0e0e0	Fix plus sign in path bug with downloads & uploads	2022-11-30 20:28:24 -05: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
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
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	e8564566ed	Appease the linter	2022-11-19 18:21:10 -05: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	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	5a2dc555f8	Merge branch 'dev' into feature/log-filter	2022-10-22 20:45:24 +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
Andrew	23b3e642a0	Only collect server stats when clients	2022-10-20 15:33:51 -04:00
Andrew	c2f5daf8e9	Remove feature for modded servers	2022-10-20 15:05:58 -04:00
Andrew	2d5d263852	Automatically set update url for server creation	2022-10-20 14:58:43 -04:00
Silversthorn	a0454ad3f1	Fix server_stats db file when deleting server	2022-10-15 10:13:17 +02:00
Andrew	51f507c4f8	Add comments	2022-10-13 12:25:29 -07:00
Andrew	3f2e50a5dd	Add config compare to not overwrite user changes	2022-10-13 12:17:31 -07:00
Andrew	3f4d232910	Add log filtering ... known bug: when adding more than 4 items to js array	2022-10-12 23:29:20 -04:00
Zedifus	0721c0d7d4	Strip meta from sem version	2022-10-08 18:34:38 +01:00
Zedifus	68be3aac16	Merge branch 'dev' into bug/stats-timeout	2022-10-08 18:20:00 +01:00
Zedifus	fbb6dad524	Merge branch 'dev' into tweak/themes	2022-10-08 18:12:37 +01:00
amcmanu3	3ac77d05c7	Add timeout to socket	2022-10-07 19:42:28 -04:00
Zedifus	47a9210750	Merge branch 'dev' into bug/backup-config-persistance	2022-10-05 22:36:59 +01:00
Zedifus	c1374b5c7f	Merge branch 'dev' into bug/port-constraint	2022-10-05 22:12:14 +01:00
Zedifus	522adb765c	Appease lint ... Major - R1705: Unnecessary "else" after "return", remove the "else" and de-indent the code inside it	2022-10-05 22:02:17 +01:00
amcmanu3	c58e4e3ebf	Clean up backup configs when deleting servers	2022-10-04 16:37:53 -04:00