1201 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andrew	abb7b8af08	Update copyright again	2022-01-01 00:16:43 -05:00
Andrew	1e54f2e3af	Update copyright	2022-01-01 00:15:33 -05:00
Andrew	de191cdf3f	Merge branch 'pretzel-branch' into 'dev' ... Minor fixes for files. Still need to get this efficient. See merge request crafty-controller/crafty-commander!125	2021-12-21 22:39:59 +00:00
Andrew	5d6cbf6a4f	add port checking stuff	2021-12-21 17:39:24 -05:00
Andrew	c9908a3e0f	Add sorting to filelist	2021-12-21 17:36:49 -05:00
Andrew	460472fe9d	Fix weird caching thing causing slow folder opening on files	2021-12-21 17:33:59 -05:00
Andrew	b6c9c96419	Merge branch 'dev' into 'pretzel-branch' ... Remove deprecated experimental tag See merge request crafty-controller/crafty-commander!124	2021-12-21 21:17:38 +00:00
Andrew	3e2d2c89ee	hotfix for failed scandir	2021-12-21 16:11:48 -05:00
Andrew	b3cb6006e9	Merge branch 'pretzel-branch' into 'dev' ... Fix user error when trying to edit own language See merge request crafty-controller/crafty-commander!123	2021-12-21 20:59:33 +00:00
Andrew	3ed304c378	Add fix for port checker. We'll see if this works this time.	2021-12-21 15:58:48 -05:00
Andrew	07d7c7ae60	Remove extraneous print statements.	2021-12-21 15:52:48 -05:00
Andrew	8a2f938dc9	Fix user error when trying to edit own language ... Fix bug where users could not be created because of a bad logical check for system uesr.	2021-12-21 15:39:33 -05:00
Andrew	4276635449	Merge branch 'pretzel-branch' into 'dev' ... Add improved swiftness in file loading functions. See merge request crafty-controller/crafty-commander!122	2021-12-21 20:10:16 +00:00
Andrew	2afecf8fab	Add improved file functions. ... Add sort in filenames	2021-12-21 15:04:32 -05:00
Andrew	3b1b45b34a	Merge branch 'pretzel-branch' into 'dev' ... Fix error with scheduled tasks by system See merge request crafty-controller/crafty-commander!120	2021-12-21 04:07:01 +00:00
Andrew	71d3e03875	Add final fix for system user	2021-12-20 23:04:07 -05:00
Iain Powrie	5a03d4eb7c	Remove all register interpreters before new job ... This will hopefully fix the pipeline failures, sorry for the emails	2021-12-21 03:40:39 +00:00
Andrew	b4f247bb95	Add final fixes for system user and automated backups	2021-12-20 22:34:20 -05:00
Iain Powrie	d61120cc8b	Remove persistency flag ... The pipeline runs once but fails on new jobs after attempting fix	2021-12-21 03:14:33 +00:00
Iain Powrie	7f81f3bb37	Merge branch 'revert-b814cb62' into 'dev' ... Revert "Run stages in parallel" See merge request crafty-controller/crafty-commander!119	2021-12-21 02:41:02 +00:00
Iain Powrie	12a1f29129	Revert "Run stages in parallel" ... This reverts commit b814cb62ef	2021-12-21 02:39:27 +00:00
Iain Powrie	b814cb62ef	Run stages in parallel	2021-12-21 02:36:46 +00:00
Iain Powrie	1fd489026d	Replace qemu image for arm support	2021-12-21 02:26:52 +00:00
Iain Powrie	3d54072c50	Dynamically resolve qemu image	2021-12-21 02:01:28 +00:00
Iain Powrie	abdcf29c1d	Merge branch 'devops/repair-dind' into 'dev' ... Use best practice with dind-TLS See merge request crafty-controller/crafty-commander!118	2021-12-21 01:43:51 +00:00
Iain Powrie	8719a1b3a1	Remove deprecated experimental tag ... Buildx is no longer experimental	2021-12-21 01:31:15 +00:00
Iain Powrie	31a823134c	Apply required tls variables for dind	2021-12-21 01:25:04 +00:00
Andrew	9ae0991f4b	Make system user not super user	2021-12-20 20:24:27 -05:00
Andrew	67eee3374c	Merge branch 'dev' into 'pretzel-branch' ... Dev See merge request crafty-controller/crafty-commander!117	2021-12-21 01:18:36 +00:00
Andrew	58d1ffea54	Fix error with scheduled tasks by system ... Create a system user	2021-12-20 20:17:28 -05:00
Andrew	e53da60b4f	Make files tree show up on page load	2021-12-20 12:51:27 -05:00
xithical	5c6bda79c9	Merge branch 'proxy-configs' into 'dev' ... Add proxy configs See merge request crafty-controller/crafty-commander!116	2021-12-19 18:32:10 +00:00
Andrew	6c262d20d7	Attempt fix for unzipping server dir	2021-12-18 19:31:21 -05:00
Andrew	9351e77b28	Add new translations.	2021-12-18 19:10:32 -05:00
Quentin	d4dbbcac35	Merge branch 'feature/async-polling' into 'dev' ... Made server polls asynchronus, fix for serverjars See merge request crafty-controller/crafty-commander!115	2021-12-17 16:28:32 +00:00
Quentin B	f018267b62	Made server polls asynchronus, fix for serverjars	2021-12-16 21:07:36 -05:00
xithical	cf1403a0ee	Added better handling for non UTF-8 characters in output	2021-12-13 20:44:22 -06:00
xithical	f6b1cf68af	i missed a semi-colon...	2021-12-14 00:44:56 +00:00
xithical	44297ffa44	Merge branch 'devops/log4j2-vulnerability-patch' into 'master' ... Apply vulnerability patch to mitigate CVE-2021-44228 See merge request crafty-controller/crafty-commander!113	2021-12-12 15:29:49 +00:00
xithical	a86181e368	Merge branch 'devops/log4j2-vulnerability-patch-dev' into 'dev' ... Apply vulnerability patch to mitigate CVE-2021-44228 See merge request crafty-controller/crafty-commander!114	2021-12-12 15:29:18 +00:00
Iain Powrie	fb42b3b628	Apply vulnerability patch to mitigate CVE-2021-44228	2021-12-12 15:17:22 +00:00
Iain Powrie	55bf41f7f6	Apply vulnerability patch to mitigate CVE-2021-44228	2021-12-12 15:08:35 +00:00
Andrew	c59b13bfde	Fix port issue	2021-12-09 23:58:35 -05:00
Andrew	1341730230	Merge branch 'pretzel-fix' into 'dev' ... Add timeout to telnet. See merge request crafty-controller/crafty-commander!112	2021-12-10 04:52:37 +00:00
Andrew	bc164fef67	Add timeout to telnet.	2021-12-10 04:52:37 +00:00
xithical	00735c402b	Add initial example config for nginx	2021-12-09 21:57:52 -06:00
Andrew	b6cf8390ad	Merge branch 'pretzel-fix' into 'dev' ... Pretzel fix See merge request crafty-controller/crafty-commander!111	2021-12-09 23:41:13 +00:00
Andrew	8999a9a5c3	Fix bug where terminal will not exit	2021-12-09 18:35:00 -05:00
Andrew	635f671fd9	Move internet check to start after server has started.	2021-12-09 17:58:36 -05:00
Andrew	a48078ac1a	Take edit button out of if statement in server_tasks.	2021-12-09 17:46:07 -05:00