1014 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Andrew	49893ea5a6	Merge branch 'pretzels-fixes' into 'dev' ... Pretzels fixes See merge request crafty-controller/crafty-commander!110	2021-12-09 22:39:40 +00:00
Andrew	e12f11f6d5	Add translations ... Add style to language select.	2021-12-09 11:44:08 -05:00
Andrew	fd62da8137	Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev	2021-12-09 11:33:27 -05:00
bobsfriend12	8d81921e02	fix typo	2021-12-07 20:57:17 -06:00
Quentin	12153b1207	Merge branch 'fix/exit-code-tweak' into 'dev' ... removed old exit handling logic See merge request crafty-controller/crafty-commander!109	2021-12-06 05:50:48 +00:00
Quentin B	b2dc1521d6	removed old exit handling logic	2021-12-05 23:01:44 -05:00
Iain Powrie	7c3301f220	Merge branch 'devops/dependancy-update' into 'dev' ... Add openjdk-17 to docker image See merge request crafty-controller/crafty-commander!107	2021-12-04 00:22:49 +00:00
Zedifus	50da1d9252	Add compose file to dockerignore	2021-12-04 00:16:16 +00:00
Zedifus	c8d8867085	Add openjdk17-jre-headless ... This is to support latest mc patch 1.18, also tidy initial RUN a little, to separate deps, for readablity.	2021-12-04 00:07:57 +00:00
Iain Powrie	bec3d224d8	Merge branch 'lang/spelling-grammar-fix' into 'dev' ... Lang fixes See merge request crafty-controller/crafty-commander!106	2021-12-03 23:09:45 +00:00
Iain Powrie	da2bb41877	Lang fixes	2021-12-03 23:09:45 +00:00
Iain Powrie	6966605bd0	Merge branch 'lang/include-new-language-pack' into 'dev' ... Lang/include new language pack See merge request crafty-controller/crafty-commander!105	2021-12-03 21:59:38 +00:00
Iain Powrie	e9ba371324	Lang/include new language pack	2021-12-03 21:59:38 +00:00
Andrew	ebe65e081f	Minor change to aestetic for tasks	2021-11-30 15:50:40 -05:00
Andrew	0845efc3b8	Add initial frontend to schedules	2021-11-30 15:46:30 -05:00
Andrew	33ab2583da	Fix security issues	2021-11-30 14:37:45 -05:00
Andrew	b996f7e7e7	One added file for schedules. Fix large bug where any user could access subpages when they did not have a role to give them access.	2021-11-30 12:29:53 -05:00
Andrew	e914f93ab5	Merge branch 'pretzel-windows' into 'dev' ... Fix Windows bug on server restore See merge request crafty-controller/crafty-commander!104	2021-11-30 00:17:41 +00:00
Andrew	0d34fcdea3	Add traveral check before deleting pre-existing backup dir	2021-11-29 19:13:21 -05:00
amcmanu3	b49077991e	Fix backup dir rename issue on windows.	2021-11-29 19:09:43 -05:00
Andrew	e8f36cce8d	Merge branch 'pretzel-windows' into 'dev' ... Add fix for windows Administrator lockout See merge request crafty-controller/crafty-commander!103	2021-11-29 22:21:19 +00:00
Andrew	73fbf19088	Add fix for windows Administrator lockout	2021-11-29 22:21:19 +00:00
Andrew	f2a55da58d	Fix windows root issues.	2021-11-29 17:18:06 -05:00
Andrew	1625883a7b	sending changes to windows	2021-11-29 17:12:25 -05:00
Andrew	79284a9094	Add potential fix for windows admin lockout	2021-11-29 16:56:17 -05:00
Andrew	a6b380152a	Merge branch 'pretzel-fix' into 'dev' ... Backup Restore/Root Disable See merge request crafty-controller/crafty-commander!102	2021-11-29 21:22:46 +00:00
Andrew	a19ba7dbb6	Backup Restore/Root Disable	2021-11-29 21:22:46 +00:00
Andrew	798dac02a5	Make exe update field not required.	2021-11-27 21:55:59 -05:00
Andrew	78834c1ed0	Fix bug where general user can change working directory and potentially destroy a system. ... Initial commit for path traversal for server config only.	2021-11-27 21:52:49 -05:00
Andrew	0cd8f6b3a7	Fix bug where no fields were required while editing servers	2021-11-27 20:09:13 -05:00
Andrew	f6f52d0f4e	Merge branch 'pretzel-fixes' into 'dev' ... Fix autostart error with missing param. See merge request crafty-controller/crafty-commander!100	2021-11-28 00:43:18 +00:00
Andrew	4c6b459b43	Remove useless if in backups.i	2021-11-27 19:28:53 -05:00
Iain Powrie	3de1f38c7e	Merge branch 'devops/tidy-image' into 'dev' ... Remove unnecessary files from docker image See merge request crafty-controller/crafty-commander!99	2021-11-28 00:21:01 +00:00
Zedifus	a07821ba14	Remove remaining unnecessary files from image	2021-11-28 00:16:02 +00:00
Andrew	bfe6cabd9e	Fix bug where a false EULA on delay start would cause the user to never be able to start the server.	2021-11-27 18:43:14 -05:00
Iain Powrie	e14de5ff57	Switch Dockerfile additional apk repo to latest-stable ... Edge is not required anymore.	2021-11-27 23:41:10 +00:00
Andrew	c7d3b3aa1c	Fix update notifications.	2021-11-27 18:32:53 -05:00