1813 Commits

Author	SHA1	Message	Date
amcmanu3	c0bca38319	Cleanup ajax a bit more	2023-03-01 13:27:06 -05:00
amcmanu3	cd475e0cf5	Use API to send remote commands to server	2023-03-01 13:04:51 -05:00
amcmanu3	6e35d4ae97	Default delete crafty logs after 2 weeks	2023-02-26 16:38:27 -05:00
amcmanu3	a50fa25ae5	Appease black	2023-02-25 16:25:09 -05:00
amcmanu3	1dc731c9f7	Rework logic	2023-02-25 16:15:50 -05:00
amcmanu3	b766ae10e9	Only copy bedrock_server executable on update	2023-02-25 15:40:38 -05:00
amcmanu3	a62964f3e1	Only show first mount by default	2023-02-25 14:39:29 -05:00
amcmanu3	3571b893a3	Fix f command in forge installs	2023-02-25 14:39:11 -05:00
amcmanu3	46ca7eeef0	Fix launch check bug. ... Automated server starts were not caught	2023-02-23 11:57:22 -05:00
amcmanu3	9d1b39d88c	Fix command pathing bug	2023-02-23 11:57:00 -05:00
amcmanu3	1f95b22dce	Add check for migration before starting a server	2023-02-20 15:37:51 -05:00
Andrew	70ceb1a4e7	Merge branch 'dev' into bugfix/world-size-calc	2023-02-18 09:50:16 -05:00
Zedifus	69480c8ff7	Merge branch 'dev' into bug/verbose-console	2023-02-17 00:47:54 +00:00
Zedifus	784aef9f50	Appease lint	2023-02-17 00:36:18 +00:00
Zedifus	c27e1e667d	Merge branch 'dev' into tweak/java-check	2023-02-17 00:19:27 +00:00
Zedifus	5dea17a7cb	Merge branch 'dev' into enhancement/add-storage-to-dash	2023-02-17 00:00:00 +00:00
Zedifus	2b7f14ec3c	Merge branch 'dev' into tweak/master-server-dir-config	2023-02-16 23:39:33 +00:00
Zedifus	34f1acd3e2	Appease black	2023-02-16 23:29:06 +00:00
Andrew	224e55429f	appease the linter	2023-02-15 18:44:53 -05:00
Andrew	e52294dbb3	Appease the linter	2023-02-15 18:40:20 -05:00
Andrew	491415c7fa	Re-black codebase with new standard	2023-02-15 18:01:21 -05:00
amcmanu3	46effe1fe6	Only use verbose console if user add -v flag	2023-02-14 14:44:53 -05:00
amcmanu3	a423cee40b	Check for java on forge server creation	2023-02-14 13:59:53 -05:00
amcmanu3	49b412ff83	Implement helper in server start	2023-02-14 13:59:42 -05:00
amcmanu3	cefa6e8084	Add a helper to better detect if java is installed	2023-02-14 13:59:24 -05:00
amcmanu3	b3fba650e7	Put try catch around move block ... Reset run command, executable, log path if abs	2023-02-13 13:05:54 -05:00
amcmanu3	b4e47151ce	We'll wtol the path coming in	2023-02-13 11:48:06 -05:00
amcmanu3	dd317a3460	Only support changing server dir in non-docker env	2023-02-12 12:29:05 -05:00
amcmanu3	fdf7bd7621	Add helper to check docker environment	2023-02-12 12:28:37 -05:00
Andrew	1e7d035119	Appease the linter	2023-02-11 15:42:18 -08:00
Andrew	72a2ff4c40	Merge branch 'dev' into ... enhancement/add-storage-to-dash	2023-02-11 15:36:33 -08:00
Zedifus	cafb10f7c0	Merge branch 'dev' into bugfix/world-size-calc	2023-02-11 19:48:08 +00:00
Zedifus	c151e5f3a7	Merge branch 'dev' into tweak/master-server-dir-config	2023-02-11 19:47:01 +00:00
Zedifus	91df6730cf	Merge branch 'dev' into bug/backup-tz	2023-02-11 19:10:45 +00:00
Zedifus	fa6f17e347	Merge branch 'dev' into enhancement/ignored-exits	2023-02-11 18:33:48 +00:00
Zedifus	5b383d9fa9	Merge branch 'dev' into feature/upload-progress	2023-02-11 18:10:32 +00:00
Zedifus	454f73c63e	Merge branch 'dev' into refactor/cleanup-authentication-helpers	2023-02-11 18:03:08 +00:00
amcmanu3	52833d8126	Appease the linter	2023-02-10 18:03:49 -05:00
amcmanu3	923082b58d	Pass tz object instead of text for tz fallback	2023-02-10 16:36:20 -05:00
amcmanu3	1b1c960cb6	Add helper to get all mounts. ... Default storage monitoring to all mounts	2023-02-10 15:17:36 -05:00
amcmanu3	6d0ec12a6f	Fix typos in server-config form. Fix whitespace	2023-02-10 14:48:19 -05:00
amcmanu3	87fdb1627c	Add feature - ignore exit codes on crash detection	2023-02-10 14:02:26 -05:00
amcmanu3	f381562b3b	Make monitored mount points user configurable	2023-02-05 19:05:20 -05:00
amcmanu3	a6d1f7b62c	Add realtime storage updates	2023-02-05 18:03:59 -05:00
amcmanu3	b224103778	Add storage to the dashboard	2023-02-05 16:47:12 -05:00
amcmanu3	0afa2cfd97	Add dir calc to separtate schedule- reduce latency	2023-02-05 13:08:04 -05:00
amcmanu3	14a2f28818	Another refactor	2023-02-05 13:07:18 -05:00
amcmanu3	a70d531ae1	Refactor naming of keys	2023-02-05 13:06:52 -05:00
amcmanu3	42b564de1c	Fix error codes	2023-02-01 17:16:08 -05:00
amcmanu3	bb482b8381	Use response text for errors on uploads. ... Overhaul	2023-02-01 17:09:39 -05:00
amcmanu3	5bccfab7b6	add ignored names in conditional	2023-01-31 13:53:27 -05:00
amcmanu3	750e4f40c0	Remove "my secret" from authentication	2023-01-31 13:30:41 -05:00
amcmanu3	6e0805a8a1	Lol uncomment the fix	2023-01-31 13:14:01 -05:00
amcmanu3	ed30cbd4cb	Refactor public handler keys	2023-01-31 13:11:28 -05:00
amcmanu3	683c9cecba	Add background key to server_handler page_data	2023-01-31 13:11:03 -05:00
amcmanu3	43c11f80b8	Appease the linter	2023-01-30 19:11:37 -05:00
amcmanu3	82dc20e94a	Remove print statements	2023-01-30 18:35:04 -05:00
amcmanu3	e43c63a8b7	Fix db not found issue ... Add page feedback.	2023-01-30 18:31:46 -05:00
amcmanu3	863ded782a	Add move servers dir functionality	2023-01-30 15:23:10 -05:00
amcmanu3	aaefcb913b	Append to subdir function for windows mapping	2023-01-30 15:22:40 -05:00
amcmanu3	3a763178d7	Merge branch 'dev' into tweak/master-server-dir-config	2023-01-30 12:14:58 -05:00
Zedifus	5699aa40e8	Merge branch 'dev' into enhancement/auto_log-dash	2023-01-29 23:35:34 +00:00
Iain Powrie	4300cab1b9	Merge branch 'refactor/config-json' into 'dev' ... Managed config.json refactor See merge request crafty-controller/crafty-4!485	2023-01-29 23:33:55 +00:00
amcmanu3	3f3595acb4	Sort config.json in alphabetical order	2023-01-29 18:21:04 -05:00
amcmanu3	bd8e12f884	Fix wording in reset	2023-01-29 17:00:28 -05:00
amcmanu3	2d9529ba0c	Add cookie secret to DB ... Allow users to reset cookie and api secret Add Crafty row to table on fresh install Change inserts to updates for crafty settings table.	2023-01-29 16:54:02 -05:00
amcmanu3	02273580f6	Appease the linter AGAIN	2023-01-29 15:20:27 -05:00
amcmanu3	5ab224d17e	Appease the linter	2023-01-29 15:18:10 -05:00
amcmanu3	040536f320	Merge branch 'dev' into bugfix/file-tree-reload	2023-01-29 15:13:02 -05:00
Zedifus	aa2ba4f8cf	Merge branch 'dev' into refactor/config-json	2023-01-29 20:00:09 +00:00
amcmanu3	8ee274a927	Remove config.json from repo. ... Remove version checking. Move master config to helpers. Add config.json when not found on start.	2023-01-29 14:54:25 -05:00
Zedifus	52459a4cf6	Merge branch 'dev' into enhancement/config-json	2023-01-29 19:26:43 +00:00
Zedifus	14d444b90c	Merge branch 'dev' into tweak/server-stats-db-hidden	2023-01-29 18:59:29 +00:00
amcmanu3	e0541b1ec0	Change file tree doesn't reload on upload/delete	2023-01-28 19:10:27 -05:00
Silversthorn	8b62814f17	Add Default redirection to Dashboard to prevent login if the user is connected	2023-01-28 16:43:27 +01:00
Silversthorn	d01dfe40db	Merge branch 'dev' into enhancement/config-json	2023-01-28 01:37:41 +01:00
amcmanu3	afdb9d9386	Use ignored_names as class variable in helpers	2023-01-27 17:36:23 -05:00
Zedifus	e217c63fdf	Merge branch 'dev' into bug/ReworkDefautPublicHandler	2023-01-27 19:59:12 +00:00
Zedifus	55523b3ce4	Merge branch 'dev' into tweak/raknet-icon-failure	2023-01-27 19:47:22 +00:00
Zedifus	b5d259bce7	Merge branch 'dev' into feature/backup-echo	2023-01-27 19:39:05 +00:00
Zedifus	84592c178e	Merge branch 'dev' into refactor/scheduled-task-queue	2023-01-27 19:30:03 +00:00
Zedifus	bfe9d2082b	Merge branch 'dev' into tweak/backup-file-time-	2023-01-27 19:20:58 +00:00
Zedifus	e8d2414815	Merge branch 'dev' into bugfix/schedule-restore	2023-01-27 19:05:50 +00:00
Zedifus	e61941613a	Merge branch 'dev' into dev-transparent-login	2023-01-27 18:40:01 +00:00
Andrew	8a5cc6d1e6	Set up back end for master server dir	2023-01-26 19:21:39 -05:00
Silversthorn	bc2776c666	Be good with the linter	2023-01-26 22:26:41 +01:00
Silversthorn	d97a792987	Remove public page to use direct login as status one ... Rework HTTP Handler as we redirect all trafic to HTTPS	2023-01-25 23:26:04 +01:00
Silversthorn	4248174041	Fixing Double Migration at Startup	2023-01-25 23:20:45 +01:00
Andrew	58f6448784	Move sleep into shutdown block	2023-01-21 13:16:01 -05:00
Andrew	248a5a63a9	Include option for after command	2023-01-21 13:13:02 -05:00
Silversthorn	0a418363b0	Improving Display of Panel Config Pages	2023-01-21 12:29:08 +01:00
Andrew	fa9be860bd	Move raknet icon failure to a debug log	2023-01-20 17:42:39 -05:00
Andrew	cf9ad77879	Add option to run command before backup	2023-01-20 17:35:30 -05:00
amcmanu3	634edb0e8b	Remove unused import	2023-01-19 12:06:37 -05:00
amcmanu3	7ee86f3ce1	Fix logic issue	2023-01-19 12:06:29 -05:00
amcmanu3	60785500b9	Remove commands table	2023-01-19 11:47:07 -05:00
amcmanu3	dfa2f5fb1e	Remove antequeted code after moving from db	2023-01-19 11:28:00 -05:00
amcmanu3	efd3bef029	Use queues for scheduled task disapatch	2023-01-19 11:27:33 -05:00
Silversthorn	35d33ef51c	Improving config_json form and Fixing disabled languages	2023-01-18 22:01:23 +01:00
Andrew	33b9026e8e	Fix delete. Remove secondary selection box	2023-01-18 14:40:01 -05:00
Andrew	0d85b55c06	Allow file paths with symbols for background	2023-01-18 14:35:35 -05:00
Silversthorn	7984ca8157	Add Personalized Transparency for Login Page's Form	2023-01-17 20:40:16 +01:00
amcmanu3	6dfabab4af	Set backup filename to use same time as schedule	2023-01-17 10:27:55 -05:00
Andrew	ede865bf33	Appease the linter and fix stinky code	2023-01-16 15:16:43 -05:00
Andrew	2e25ed84c5	Remove print statements	2023-01-16 14:30:55 -05:00
Andrew	1802a7e7ef	Add backup preservation ... Add update job to bedrock	2023-01-16 14:15:45 -05:00
Andrew	944d01ab19	Fix schedule restores	2023-01-16 11:20:15 -05:00
Andrew	8d8b065e41	Working config.json from page	2023-01-15 18:57:22 -05:00
Andrew	bea48d9059	Add better formatting for lists.	2023-01-10 14:12:33 -05:00
Andrew	5d3dbc6f9c	Fix security	2023-01-09 19:01:05 -05:00
Andrew	4f4ec16a9b	Make config editable from Crafty	2023-01-09 18:52:45 -05:00
Andrew	4031b74e00	Hide server stats db from users	2023-01-09 16:34:12 -05:00
Andrew	199c8a4fe6	Fix local java server imports	2023-01-08 00:32:08 -05:00
Andrew	52ef76e15b	Replace google ping for ntp for usability in china	2023-01-03 10:14:10 -08:00
Zedifus	205d111251	Merge branch 'dev' into bug/unzip-logic	2023-01-02 22:48:42 +00:00
Zedifus	aaffe69cb3	Merge branch 'dev' into bug/nested-reaction	2023-01-02 22:10:22 +00:00
Zedifus	6c2a63f1e8	Merge branch 'dev' into bug/server-config-save	2023-01-02 21:18:49 +00:00
Zedifus	c80d357f13	Fix CodeQuality, line length	2023-01-02 20:59:29 +00:00
Andrew	4922998b14	Remove extra task definition	2023-01-02 14:34:08 -05:00
Andrew	985178b993	Update zip import status	2023-01-02 14:26:42 -05:00
Andrew	872489d125	Remove useless block in unzip method ... This was causing an error.	2023-01-02 12:20:18 -05:00
Andrew	9ebdbbf5af	Fix bug where nested reaction tasks would stack	2023-01-01 23:13:07 -05:00
Andrew	ddaac25060	Run forge installer for all versions of forge	2022-12-23 20:14:41 -05:00
Andrew	88cd991b7e	Fix bug where server_path variable was still used ... I'm dumb and I fixed a bug I created.	2022-12-22 20:59:45 -05:00
Silversthorn	9dac0b5d85	Adding Forge Installer Compaptibility with old versions	2022-12-22 19:32:56 +01:00
Andrew	d5cc4529b0	Add try/except for not finding run file	2022-12-21 21:55:21 -05:00
Zedifus	3c0330de38	Merge branch 'dev' into refactor/config-json	2022-12-21 16:19:16 +00:00
Zedifus	5c10dd884f	Merge branch 'dev' into bug/windows-path-java-override	2022-12-21 16:04:28 +00:00
Zedifus	edfa147a8b	Merge branch 'dev' into bug/mac-m1-stats	2022-12-21 15:56:05 +00:00
amcmanu3	262ec80db8	Remove print statement	2022-12-19 17:47:31 -05:00
amcmanu3	9004feff37	Fix windows slash escape java override	2022-12-19 17:44:04 -05:00
amcmanu3	fbc506f2fd	Fix issues after merge conflicts	2022-12-19 17:15:26 -05:00
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
amcmanu3	ad41960338	Appease the linter	2022-10-04 16:23:29 -04:00
Andrew	b8e0e2b0fb	Add catch for those that have existing bad ports	2022-10-04 16:14:22 -04:00
amcmanu3	3681f52856	Fix scheduled task disable	2022-10-04 16:07:08 -04:00
Andrew	2e212cc788	Add port constraint for all server creation & api	2022-10-04 15:55:52 -04:00
Andrew	f558388a0f	Update themes to include all colors	2022-10-04 13:31:37 -04:00
Zedifus	0ab8a2d80e	Merge branch 'dev' into bug/websocket-clients	2022-10-02 21:16:31 +01:00
Andrew	352a3e12e7	Fix minor bugs with uploads import	2022-10-02 15:54:13 -04:00
Andrew	5f8c0dab4c	Merge branch 'dev' into 'feature/upload-import' ... # Conflicts: # app/frontend/templates/server/wizard.html	2022-10-02 19:10:05 +00:00
Zedifus	7cc8503941	Merge branch 'dev' into enhancement/themes	2022-10-02 19:52:56 +01:00
Zedifus	f9a918e014	Merge branch 'dev' into bug/api-stdin	2022-10-02 19:40:13 +01:00
Andrew	cb064f95df	Fix set size changed during iteration	2022-10-02 14:29:36 -04:00
Andrew	a21bb36f7c	Make it so a user cannot upload anything but zip ... TODO add better feedback than "error"	2022-09-27 23:07:44 -04:00
Andrew	f090bf8c6f	Add task to check for old files every 12 hours	2022-09-27 22:57:24 -04:00
Andrew	ab344cbff4	Add zip upload to bedrock servers	2022-09-27 22:49:52 -04:00
Andrew	b9bd654e58	Add upload import functionality. ... Update gitignore	2022-09-27 22:06:22 -04:00
Andrew	8e1534e268	Add arguments to API routes	2022-09-26 21:31:44 -04:00
Andrew	a5a81aa22a	Add themes to users page/base	2022-09-26 21:23:47 -04:00
Andrew	05f08773a3	Add themes to users DB	2022-09-26 21:23:16 -04:00
Andrew	046943c250	Fix bug with API stdin	2022-09-25 12:14:01 -04:00
Andrew	eaa68751b2	Fix type error on interval check.	2022-09-25 11:17:44 -04:00
Andrew	e2c846205b	self.clients was already a set. cannot subscript	2022-09-22 21:42:58 -04:00
Zedifus	3209f69d14	Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev	2022-09-20 23:22:00 +01:00
Zedifus	03a54d0249	Override 'unsubscriptable-object' pylint rule ... False positive from 'self' use	2022-09-20 23:21:57 +01:00
amcmanu3	ff8ddb0f6e	Fix cron edit traceback. ... Do not allow day to be greater than 30	2022-09-20 17:52:11 -04:00
amcmanu3	ca2358ac0a	Fix user creation traceback	2022-09-20 17:43:54 -04:00
amcmanu3	63347f956b	Fix logical issues surrounding Gravatar fetch	2022-09-19 20:00:15 -04:00
Zedifus	0829331534	Appease Minor and Major lint issues in !464	2022-09-19 23:49:16 +01:00
Zedifus	532409a08d	Merge branch 'dev' into bug/start-nonetype	2022-09-19 22:57:42 +01:00
Zedifus	2b36fbd448	Merge branch 'dev' into tweak/reaction-schedules	2022-09-19 22:50:55 +01:00
Zedifus	48b3c26f42	Merge branch 'dev' into bug/websocket-client-list-size	2022-09-19 22:40:23 +01:00
Zedifus	d3cfdd4a78	Merge branch 'dev' into bug/unloaded-server-config	2022-09-19 22:33:30 +01:00
Zedifus	518eb6af23	Merge branch 'dev' into bug/gravatar-fetch	2022-09-19 22:18:11 +01:00
Zedifus	d2d812edb7	Merge branch 'dev' into tweak/backup-restore	2022-09-19 22:11:53 +01:00
Zedifus	be8b24975d	Merge branch 'dev' into bug/bleach	2022-09-19 22:04:59 +01:00
Andrew	f5cdd9f573	Check to "which java" doesn't return none	2022-09-19 11:13:35 -04:00
Andrew	9ecf912a98	Make default option be selected option in edit	2022-09-16 13:15:07 -04:00
amcmanu3	187860056c	Create set from list for client list size change	2022-09-16 13:09:10 -04:00
Andrew	a3c1d9e051	Fix typo in panel handler for unloaded config	2022-09-14 13:13:32 -04:00
Andrew	67d465b94c	Add debug logging	2022-09-12 15:36:13 -04:00
Andrew	82c0452f55	Add pfp caching for users	2022-09-12 15:34:47 -04:00
amcmanu3	2b35da71fc	Fix logic with gravatar email	2022-09-09 15:04:45 -04:00
amcmanu3	375df0c27d	Only check for gravatar if internet	2022-09-09 15:00:08 -04:00
amcmanu3	e14e795b47	Add schedules to backup restore ... Persist execution command	2022-09-09 14:49:31 -04:00
Andrew	6a6376ea8a	appease the linter	2022-09-07 16:52:27 -04:00
Andrew	d45e32013b	Fix backup exclusion issue	2022-09-07 16:51:41 -04:00
Andrew	296a5a46de	Add comments. Debug logging	2022-09-07 16:01:42 -04:00
Andrew	7437944988	Fix & issues	2022-09-07 15:56:18 -04:00
Andrew	df7d10886e	Fix & with bleach	2022-09-07 14:55:40 -04:00
amcmanu3	1b2fef06fb	Fix critical bug with unloaded servers	2022-09-05 23:15:07 -04:00
amcmanu3	011b66e1df	Fix server startup after update	2022-09-04 19:06:07 -04:00
amcmanu3	76a499f5a4	Fix start server after updates ... Fix update notifs	2022-09-04 17:50:08 -04:00
Zedifus	b0403a0b1f	Merge branch 'dev' into bug/mc-ping-traceback	2022-09-04 21:51:50 +01:00
Zedifus	385ceb9655	Merge branch 'dev' into tweak/password-reset	2022-09-04 21:41:27 +01:00
Zedifus	0bce6f432a	Merge branch 'dev' into enhancement/metrics-range	2022-09-04 21:25:45 +01:00
amcmanu3	e9c74be057	Add ability to change metrics scale	2022-09-04 16:21:33 -04:00
Zedifus	7f95f7085d	Merge branch 'dev' into feature/bedrock-creation	2022-09-04 21:12:47 +01:00
Zedifus	88d3facc80	Merge branch 'dev' into enhancement/bedrock-update-support	2022-09-04 21:03:31 +01:00
amcmanu3	ceab737667	Update requirement checking for password reset	2022-09-04 14:22:25 -04:00
amcmanu3	a6148a7d8a	Make password username lowercase	2022-09-04 13:33:22 -04:00
Andrew	dd56b4be37	update updates	2022-09-03 13:42:30 -04:00
Andrew	1f95ad600c	Add return	2022-09-03 13:26:51 -04:00
Andrew	5d688522bd	Fix backup logic	2022-09-03 13:23:30 -04:00
Andrew	6559112e1b	Fix update logic	2022-09-03 13:16:03 -04:00
Andrew	9a7a1cc5d8	Change elif to else	2022-09-03 12:46:35 -04:00
Iain Powrie	3bdaec7837	Apply 1 suggestion(s) to 1 file(s)	2022-09-03 16:40:59 +00:00
Zedifus	77a858f24e	Merge branch 'dev' into bug/import3-servers	2022-09-02 13:27:00 +01:00
amcmanu3	99979f668b	Fix black formatting	2022-09-01 12:51:54 -04:00
amcmanu3	d5ecfe9128	Add spinner to update button	2022-09-01 12:46:37 -04:00
Iain Powrie	3e370c0ae4	Apply 1 suggestion(s) to 1 file(s)	2022-09-01 14:41:42 +00:00
Andrew	0bc7e584e0	Wrap sock.recv in try/execpt to stop failure	2022-09-01 10:29:47 -04:00
amcmanu3	2becb657ca	Put try/except around creation	2022-08-31 20:01:38 -04:00
amcmanu3	bd38fcd6e4	Add try/except around download	2022-08-31 19:59:46 -04:00
amcmanu3	a07eb58db7	Add bedrock server creation	2022-08-31 19:45:19 -04:00
amcmanu3	b274f0d3b0	Remove update url from config	2022-08-31 19:36:43 -04:00
amcmanu3	b445d085c8	Fix no id on import3 servers	2022-08-31 16:11:49 -04:00
Zedifus	96c4fa3bdd	Validate bedrock url before download with urllib ... Even though there will be an incredibly small chance of tampering this is to make bandit happy "Bandit Test ID B310" https://stackoverflow.com/a/53040523/18355876	2022-08-31 20:04:39 +01:00
Zedifus	0c9e10f18a	Fix sec overly permissive file permissions ... 775 is too permissive for this file, '-rwxr--r--' is more than enough B103: Test for setting permissive file permissions https://bandit.readthedocs.io/en/latest/plugins/b103_set_bad_file_permissions.html	2022-08-31 19:50:35 +01:00
Zedifus	fdf1a5a41d	Add url helper to bedrock update	2022-08-31 19:46:07 +01:00
Zedifus	9350ed07d7	Add bedrock remote url helper	2022-08-31 19:04:04 +01:00
Andrew	0f820433f1	Remove log path from config for bedrock	2022-08-31 12:39:52 -04:00
Andrew	600de2be0c	Fix executable backups ... Cleanup after ourselves	2022-08-31 12:18:52 -04:00
Andrew	266e540374	Add bedrock update support	2022-08-31 11:59:33 -04:00
Andrew	7f412954d7	Fix metrics schedule lag	2022-08-30 17:27:19 -04:00
Zedifus	51d123e9eb	Merge branch 'dev' into tweak/support-logs-zip-comment	2022-08-27 19:00:38 +01:00
Zedifus	fdb98cf1f8	Merge branch 'dev' into feature/pretzel-metrics-graph	2022-08-27 18:00:36 +01:00
Zedifus	b0b04a6495	Merge branch 'dev' into feature/pretzel-variable-shutdown-timeout	2022-08-27 17:50:50 +01:00
Zedifus	1b4777fbab	Merge branch 'dev' into feature/pretzel-users-roles-manager	2022-08-27 17:25:49 +01:00
Zedifus	6f66b77478	Add 'optional' comment to all archival methods	2022-08-27 17:05:13 +01:00
Andrew	b1769ba9a4	Remove manager parameter from add_raw_pass	2022-08-27 11:25:55 -04:00
Andrew	27ad78c14d	Make admin manager none on fresh install	2022-08-27 11:17:31 -04:00
Andrew	3c14d0f2ee	Appease the linter	2022-08-27 10:44:34 -04:00
Zedifus	7d801ac216	Add date and time to log archive	2022-08-26 16:23:08 +01:00
Zedifus	b8b61649b7	Tidy support string creation and include as comment	2022-08-26 15:57:35 +01:00
Zedifus	d3b7ab048d	Add comment arg to make_compressed_archive ... This is an optional arg that will add a comment to zip file	2022-08-26 15:56:31 +01:00
Andrew	037758accb	Working live graph	2022-08-22 20:04:40 -04:00
Andrew	4225de55e8	Add server metrics graph	2022-08-21 17:04:23 -04:00
Andrew	9d961215a5	Fix logical bug with shutdown log/console prompts	2022-08-21 13:00:24 -04:00
Andrew	44afc72d3a	Add variable shutdown timeouts	2022-08-21 12:41:28 -04:00
amcmanu3	02b6c3b545	Fix logical issues with panel handler	2022-08-20 20:58:46 -04:00
amcmanu3	6b82170d6f	Appease the linter	2022-08-20 20:47:15 -04:00
Andrew	0672b9378a	Add more secure logic to add/edit users	2022-08-20 18:51:35 -04:00
Andrew	cbbb9f9fd2	Fix clone server not taking into account quotas	2022-08-20 13:45:10 -04:00
Andrew	0f43917083	Remove unused methods	2022-08-20 13:15:44 -04:00
Andrew	cafa720bba	Fix server quotas. Removed un-used perms columns	2022-08-20 13:00:20 -04:00
Andrew	245d64ca45	Refactor managed roles to users controller/model	2022-08-20 12:56:38 -04:00
Andrew	31b75b1c50	Remove manager from role when user deleted	2022-08-20 10:24:43 -04:00
Andrew	7a68e08a64	Working role manger super user ... TODO: Remove maanger after user is deleted	2022-08-20 09:31:33 -04:00
Andrew	552a2e26c2	Working role managers. ... TODO: Add super user select option	2022-08-20 08:49:38 -04:00
Andrew	bd64f0d2ae	Initial commit for role managers	2022-08-20 08:32:39 -04:00
amcmanu3	f75286e112	Fix logical issue in panel_handler	2022-08-19 15:14:42 -04:00
amcmanu3	c1d16522d0	Add manager field to users	2022-08-19 13:09:59 -04:00
amcmanu3	b10523ae0a	Add import status to working bedrock	2022-08-17 19:07:56 -04:00
amcmanu3	504ffd57f6	Working zip imports	2022-08-17 18:14:16 -04:00
amcmanu3	b5420c083e	Starting zip imports	2022-08-17 17:41:44 -04:00
amcmanu3	eea5e329af	Refactor and add import_helpers. ... Working jar imports	2022-08-17 17:22:03 -04:00
amcmanu3	65c8ca680b	Add importing threading to jar servers. ... Refactor "downloading" status	2022-08-17 14:48:05 -04:00
Zedifus	e2a4e096a2	Merge branch 'dev' into bug/backup-reload	2022-08-14 18:36:27 +01:00
Zedifus	ab5f587f50	Merge branch 'dev' into tweak/pretzel-backup-list	2022-08-14 18:03:30 +01:00
Zedifus	8c3649d0bb	Merge branch 'dev' into bug/pretzel-fresh-install	2022-08-14 17:53:22 +01:00
Andrew	1545c1415c	Reload backup page on front end	2022-08-12 20:24:11 -04:00
amcmanu3	f6975912f4	Only list zip files in backups list	2022-08-07 12:19:58 -04:00
amcmanu3	f4660fb36c	Make fresh install more efficient	2022-08-07 11:30:00 -04:00
amcmanu3	675912a0b6	Check for number of users in fresh install	2022-08-07 11:04:12 -04:00
Andrew	be7a816f78	Fix reaction tasks not firing ... Fix delay not being accurate	2022-08-07 01:30:59 -04:00
amcmanu3	8897856aef	Remove Update button when unloaded ... Fix duplicate list issue	2022-08-05 20:24:42 -04:00
Zedifus	c5d049830e	Merge branch 'dev' into bug/unloaded-servers	2022-08-06 01:10:16 +01:00
amcmanu3	5cbb8f7018	Fix broken unloaded servers	2022-08-05 20:04:34 -04:00
Zedifus	3e3c0ff946	Merge branch 'dev' into enhancement/pretzel-schedules	2022-08-06 00:20:31 +01:00
Zedifus	13a0500e86	Switch to v2 credits schema	2022-08-05 23:38:32 +01:00
amcmanu3	b039eec857	First commit for unloaded server. Working Frontend	2022-08-05 17:56:44 -04:00
amcmanu3	3c8614f378	Fix traceback when editing schedule	2022-08-05 16:01:26 -04:00
amcmanu3	75c8cdef53	Add names to schedules	2022-08-05 13:52:50 -04:00
amcmanu3	ad318296dc	Fix no new_job error	2022-08-04 23:57:22 -04:00
amcmanu3	f69d79b702	Fix indenting on jobs being added	2022-08-04 23:23:56 -04:00
Zedifus	6d08d31d97	Add log lines for update notif ... Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>	2022-08-05 03:02:02 +01:00
Zedifus	390d995f53	Add flashing frontend notification ... Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>	2022-08-05 02:56:26 +01:00
Zedifus	59174110ab	Remove print statement ... Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>	2022-08-05 02:38:43 +01:00
Zedifus	ff0faffc08	Add update check to 12hr schedule ... Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>	2022-08-05 02:37:21 +01:00
Zedifus	1e6df269ac	Merge branch 'dev' into feature/crafty-version-check	2022-08-05 01:53:40 +01:00
Zedifus	a0b599bbd2	Merge branch 'dev' into enhancement/pretzel-next-run	2022-08-05 01:27:18 +01:00
Zedifus	da6a3e3688	Merge branch 'dev' into bug/server-creation-api	2022-08-05 00:33:58 +01:00
Zedifus	6c901e5e3e	Merge branch 'dev' into bug/pretzel-backup-restart	2022-08-05 00:20:20 +01:00
Iain Powrie	5353cd854f	Change sleep from 60 to 3	2022-08-04 23:18:01 +00:00
amcmanu3	18a0b95d29	Fix lint issues	2022-08-04 18:34:43 -04:00
amcmanu3	6c0cd54e7e	Add next run to schedule info	2022-08-04 18:15:59 -04:00
Andrew	4f4798d44a	Add serverjars cache refresh	2022-08-03 15:38:44 -04:00
Andrew	d1bdb6198b	Fix server creation with serverjars API ... By accident this adds some modded support. TODO: Cleanup javascript in wizard. Fix naming on selects in wizard	2022-08-02 21:08:53 -04:00
Andrew	ad0d47c357	Check for server backup on restart	2022-07-30 14:47:07 -04:00
Andrew	af009a96d9	Fix bug where no java reg path found stack	2022-07-30 13:17:01 -04:00
Zedifus	99ae7e01a1	Tidy import naming ... This will allow for previous variable naming	2022-07-21 00:39:29 +01:00
Zedifus	ebe5d6815c	Add helper for remote version check	2022-07-20 23:53:31 +01:00
Andrew	9616ffb0a1	Fix bug where SU status wouldn't stick on creation ... Clean up SU user edit logic	2022-07-19 11:21:22 -04:00
Zedifus	1c2b70ae1d	Merge branch 'dev' into bug/server-order-on-creation	2022-07-18 23:52:56 +01:00
amcmanu3	383194cf66	Fix servers being out of order on creation page.	2022-07-18 17:12:43 -04:00
Zedifus	31fe66776c	Merge branch 'dev' into incident/log-file-issues	2022-07-18 22:03:03 +01:00
Zedifus	4f3fc40e5b	Merge branch 'dev' into tweak/support-logs	2022-07-18 21:52:36 +01:00
Zedifus	28b321f100	Fix import order ... I have needs	2022-07-18 21:43:13 +01:00
Zedifus	4a2e5d1558	Merge branch 'dev' into tweak/remove_prop_requirement	2022-07-18 21:42:14 +01:00
Zedifus	374454f11c	Merge branch 'dev' into bug/fix-issue-#106	2022-07-18 21:17:41 +01:00
Zedifus	b7b4c7ac11	Merge branch 'dev' into bug/fix-issue-#106	2022-07-18 21:17:16 +01:00
Zedifus	523e51a0ae	Merge branch 'dev' into Fix-Pylint-no-self-use	2022-07-18 21:09:51 +01:00
Zedifus	44f3b903d4	Merge branch 'dev' into Fix-Pylint-no-self-use	2022-07-18 21:09:26 +01:00
Zedifus	11dd41501e	Merge branch 'dev' into feature/pretzel-status-page-show	2022-07-18 21:01:32 +01:00
Zedifus	a9e0970a1c	Merge branch 'dev' into hotfix/host-stats-error	2022-07-18 20:48:32 +01:00
Silversthorn	98fa8e8940	Giving json to auth_data	2022-07-18 20:57:04 +02:00
amcmanu3	f265b070c0	Fix log file path issue for support log/log delete	2022-07-18 14:55:12 -04:00
Silversthorn	bc16e0df2b	Revert "Revert changes on base_handler, fixing things in the api methods" ... This reverts commit f863357633.	2022-07-18 20:53:49 +02:00
Andrew	31ee894603	Add platform & crafty version info to support logs	2022-07-17 16:37:10 -04:00
Silversthorn	f863357633	Revert changes on base_handler, fixing things in the api methods	2022-07-17 12:17:45 +02:00
Silversthorn	b6d6b9c0a4	Remove unused elements and move get_players to py file instead of html file	2022-07-17 10:57:25 +02:00
Andrew	d8fadc6abd	fix bug broken server creation	2022-07-16 19:19:34 -04:00
Andrew	2ddc1e7c96	Remove server.props requirement	2022-07-16 19:05:00 -04:00
Andrew	ea9b14e917	Add default value to show_status	2022-07-16 18:50:05 -04:00
Silversthorn	8e58d5f8ac	Trying Fixing issue #106	2022-07-16 10:49:48 +02:00
Silversthorn	ee2c2f8bb1	Better use of functions and objects	2022-07-16 10:06:49 +02:00
Silversthorn	9f30ca3931	Fix pylint no-self-use	2022-07-16 09:52:30 +02:00
Andrew	5b599d0058	Appease the linter	2022-07-15 18:47:41 -04:00
Andrew	11260a34d6	Toggle Visible servers on status page	2022-07-14 18:26:42 -04:00
luukas	875767e16c	Merge branch 'dev' into feature/ajax-schedule-enabled	2022-07-13 15:48:09 +03:00
luukas	4f7e1bfa24	Check for None when getting the CPU frequency data ... Default to -1 when an error occurs	2022-07-06 19:00:17 +03:00
Zedifus	102a470348	Merge branch 'dev' into bug/edit-user-issues	2022-07-06 02:50:06 +01:00
amcmanu3	f1d11bfb0d	Remove tempdir from packaging logs.	2022-07-05 21:35:43 -04:00
amcmanu3	a498ef8986	Check if username exists	2022-07-05 19:49:51 -04:00
Zedifus	6406cdf66a	Merge branch 'dev' into bug/server-creation-no-servers	2022-07-05 23:36:17 +01:00
Zedifus	dc73768a83	Merge branch 'dev' into bug/bool-obj-no-desc	2022-07-05 23:26:01 +01:00
amcmanu3	69f915616b	Fix unhandled serverjars api error on server creation	2022-07-05 16:15:49 -04:00
amcmanu3	6f80b3e5c1	Fix bug with bool obj on server start	2022-07-05 15:24:19 -04:00
amcmanu3	ea24215e21	Remove default backup dir location	2022-07-05 14:55:17 -04:00
amcmanu3	70dfc28574	Fix unable to restore backup on external meduim	2022-07-05 14:45:13 -04:00
Zedifus	48cd5916ed	Revert internal comment ... Must've changed this accidentally	2022-06-24 03:56:31 +01:00
Zedifus	9a6625ccaa	Merge branch 'dev' into bugfix/handle-none-java-return	2022-06-24 03:45:36 +01:00
Andrew	118924eeaa	Fix one more stop where this as an issue	2022-06-23 21:57:50 -04:00
Zedifus	cf25249a9d	Fix path issue with update-alternatives ... Sometimes it can be in /sbin, if it is we return `None` which broke upstream frontend. Returning an empty list to resolve this.	2022-06-24 02:28:05 +01:00
Andrew	b4749f8caf	Fix 2 bugs: Stats startup after backup ... Server java version path bug	2022-06-23 19:34:27 -04:00
luukas	147f178c87	Add a basic API for modifying schedules. ... THIS IS VERY UNTESTED AND WILL BE EXPANDED TO FULL CRUD FOR SCHEDULES	2022-06-23 01:57:29 +03:00
amcmanu3	205bbf356f	Fix traceback on server schedule creation page	2022-06-21 18:40:16 -04:00
amcmanu3	d8d80bbb42	Remove bad check for backup path	2022-06-21 17:41:52 -04:00
amcmanu3	b725054dcd	Appease the linter	2022-06-21 17:36:50 -04:00
amcmanu3	97900cd283	Fix issue on path transversal backups linux	2022-06-21 17:35:34 -04:00
amcmanu3	fdfec80a39	Fix bug with sec logic	2022-06-21 17:14:35 -04:00
amcmanu3	950cbce27c	Fix java logic issue	2022-06-21 17:00:51 -04:00
Zedifus	ffba1fb438	Merge branch 'dev' into enhancement/backup-failure-alert	2022-06-21 21:34:51 +01:00
amcmanu3	d3b1095867	Disable backups directory from changing bad paths	2022-06-21 16:14:29 -04:00
amcmanu3	6c360d1ff1	Make backup failed alert	2022-06-21 15:59:08 -04:00
Zedifus	610b94dd59	Merge branch 'dev' into tweak/file-enhancements	2022-06-21 20:41:09 +01:00
Zedifus	28e313ee1d	Revert back to 'Do not override' as default	2022-06-21 19:53:23 +01:00
Zedifus	7379545186	Strip empty entry in update-alternatives output ... Catch ValueError on missing end quote in java execution command	2022-06-21 19:28:53 +01:00
Zedifus	176f5a4004	Add java selection POST check ... Protect against tampered post requests to front end Co-authored-by: andrew.charles.mcmanus@gmail.com <andrew.charles.mcmanus@gmail.com>	2022-06-21 18:39:20 +01:00
amcmanu3	c4fb6482cc	Fix sec bug with server creation roles ... Retain current java version in dropdown.	2022-06-21 01:18:19 -04:00
Zedifus	bad7a8d625	Merge branch 'dev' into feature/java-selection	2022-06-21 04:29:37 +01:00
Zedifus	4bfbf9ea47	Merge branch 'dev' into bug/ping-data	2022-06-21 04:09:35 +01:00
Zedifus	69d1aa6c87	Appease linter	2022-06-21 03:31:40 +01:00
Zedifus	8e646df58c	Add Java detect for win, and hook up to front end	2022-06-20 23:44:33 +01:00
amcmanu3	32b3551108	Add java selection code to panel handler	2022-06-20 17:56:26 -04:00
amcmanu3	77c9d2613d	Appease black	2022-06-20 17:33:36 -04:00
amcmanu3	7670b91cc6	Add backup shutdown feature ... Add backup notif for failed backup	2022-06-20 17:16:56 -04:00
Andrew	7d286e60e0	Backup/Config.json rework for API key hardening ... See merge request crafty-controller/crafty-4!369	2022-06-20 19:26:21 +00:00
Zedifus	e820ba058a	Add prototype helper (linux only)	2022-06-20 18:05:39 +01:00
amcmanu3	ccfbad91d1	Check if ping result is boolean	2022-06-19 23:07:48 -04:00
Zedifus	b9a9007b4f	Merge branch 'dev' into tweak/front-end	2022-06-18 23:12:24 +01:00
Zedifus	376a6b3a1e	Merge branch 'dev' into critical/API-token-auth-issues	2022-06-18 23:01:39 +01:00
Andrew	9569e760c9	Fix api key permission logic issue	2022-06-18 17:40:50 -04:00
xithical	464428ea7e	Remove erroneous print statements	2022-06-18 16:29:36 -05:00
xithical	8b6d70ba9a	Fix bug where non-superusers could not edit their own API keys	2022-06-18 16:27:06 -05:00
Iain Powrie	1de2ea1b5c	Merge branch 'bug/-1-stats-showing-on-dashboard' into 'dev' ... Fix -1 showing on dashboard when offline See merge request crafty-controller/crafty-4!365	2022-06-18 21:27:05 +00:00
Andrew	478dfdc6ef	Fix -1 showing on dashboard when offline	2022-06-18 17:18:21 -04:00
Zedifus	9659963c92	Merge branch 'dev' into tweak/java-version ... Correct changelog	2022-06-18 22:14:57 +01:00
Andrew	31097da971	Fix type issue comparing	2022-06-18 17:06:44 -04:00
Andrew	a8cd982b96	Fix warning message	2022-06-18 17:03:44 -04:00
Andrew	37765dbebc	Fix general user can view any api-key page	2022-06-18 17:02:10 -04:00
Andrew	72f97e4ff0	Fix issue where any user could add/remove api keys	2022-06-18 16:55:39 -04:00
Andrew	fd0da1ef20	Fix any user can recieve all api keys	2022-06-18 16:20:57 -04:00
Andrew	e9bf2af83b	Add wiki iframe as requested.	2022-06-18 15:57:37 -04:00
Andrew	9bbf316494	Check for Oracle Java before changing start string	2022-06-17 19:11:03 -04:00
Andrew	a2ad23548c	Check for Oracle Java before changing start string	2022-06-17 19:08:57 -04:00
luukas	b4770bc9a0	Use indent=4 instead of indent=True ... `indent=True` is equivalent to `indent=1` You can test this by executing `'foo' * True`, `'foo' * 1` and `'foo' * 4` in a Python REPL.	2022-06-18 01:30:50 +03:00
luukas	5bfd564ef4	Use with-blocks when opening files	2022-06-18 01:27:55 +03:00
Zedifus	8480172bdc	Merge branch 'dev' into tweak/host-stats-exceptions	2022-06-17 15:42:37 +01:00
luukas	abc34ef2b6	Add better error logging for statistic collection	2022-06-17 16:19:37 +03:00
Andrew	e435292a52	Fix blank server_detail page for general users	2022-06-17 00:58:18 -04:00
Iain Powrie	43906d531e	Merge branch 'bug/support_logs' into 'dev' ... Bug/support logs See merge request crafty-controller/crafty-4!354	2022-06-16 16:56:56 +00:00
amcmanu3	e3d289e6fd	Fix support logs download issues	2022-06-16 12:11:21 -04:00
amcmanu3	35518e960f	Fix username capital issues once and for all	2022-06-16 09:52:21 -04:00
luukas	581b6734d3	Remove unused server_uuid variables to fix Pylint	2022-06-16 15:31:11 +03:00
luukas	e009ff9819	Use relative paths for the jarfile and logs	2022-06-16 02:10:26 +03:00
amcmanu3	8611c7e5e4	Fix win reg import on not windows. ... Replace WindowsError with OSError	2022-06-15 00:42:29 -04:00
Zedifus	00466719ea	Exempt R1717 consideration	2022-06-15 04:52:19 +01:00
Zedifus	0f82ba3084	Line exempt E0602 ... It's not an undefined var it's the Base class for I/O related errors. False positive.	2022-06-15 04:44:19 +01:00
Zedifus	5f8dbd4dc7	Fix C0113 & Exempting R0201 Line as self required.	2022-06-15 04:27:27 +01:00
Zedifus	9ed5cc3c5a	Fix pylint R1724	2022-06-15 04:15:46 +01:00
Zedifus	1cfc926b16	Fix line length CQ	2022-06-15 04:11:40 +01:00
amcmanu3	cda2120579	Fix window java issue causing no stats	2022-06-14 22:33:02 -04:00
amcmanu3	17ef71046c	Merge branch 'master' into dev	2022-06-14 15:49:32 -04:00
amcmanu3	0f43dd627a	Fix uppercase usernames imported from 3. ... Uppercase usernames will break logic on three. They need to be lowered before they are imported.	2022-06-14 15:43:29 -04:00
amcmanu3	50438c485b	Fix support log delete order. ... Fix username uppercase.	2022-06-14 15:42:13 -04:00
luukas	e73dd682c8	Fix no-else-* QA warnings	2022-06-14 15:40:57 +03:00
Zedifus	32427c3684	Merge branch 'master' into dev	2022-06-14 12:05:58 +01:00
Zedifus	f1340f4f45	Appease black	2022-06-13 22:35:33 +01:00
luukas	73a6d1cd78	Fix the error message while deleting session.log	2022-06-14 00:30:28 +03:00
Iain Powrie	75d3baccbd	Remove deprecated pylint rules ... https://github.com/PyCQA/pylint/pull/3571 https://github.com/PyCQA/pylint/pull/3577	2022-06-13 21:30:24 +00:00
luukas	0d664cfae5	Remove a useless session.log warning ... This fixes an error being sent when session.log doesn't exist. This usually occurs when the logs directory is deleted.	2022-06-14 00:16:49 +03:00
amcmanu3	55f7ab1d35	Fix traceback on crash detection startup	2022-06-13 16:13:18 -04:00
amcmanu3	e644380b64	Allow users with capital letter to reset password	2022-06-13 16:06:36 -04:00
Andrew	7e7557f530	Merge branch 'bug/import-user-error' into 'bug/tz-fallback' ... Bug/import user error See merge request crafty-controller/crafty-4!332	2022-06-13 19:21:07 +00:00
amcmanu3	074e9f33a8	Fix import3	2022-06-13 15:14:41 -04:00
amcmanu3	8f5cdbb0c5	Fix crafty3 -4 import users	2022-06-13 15:07:12 -04:00
amcmanu3	4019f0365e	Fix user import issues	2022-06-13 14:45:01 -04:00
Zedifus	6962662ce5	Fix black	2022-06-13 19:41:25 +01:00
amcmanu3	033bf05279	Appease black	2022-06-13 14:31:53 -04:00
amcmanu3	b3f167ab62	Add fallback for tz not being found	2022-06-13 14:29:25 -04:00
amcmanu3	0ffe6801d8	Fix user email bug on import3	2022-06-13 12:47:42 -04:00
amcmanu3	1655818afc	Define the prompt after the init is complete	2022-06-12 20:09:46 -04:00
Andrew	25a1c67c26	Fix black formatting	2022-06-12 17:17:58 -04:00
Andrew	474597d16c	Add survery to admin first log	2022-06-12 17:03:42 -04:00
Silversthorn	e0d0965931	Fixing Pylint for good	2022-06-12 18:39:05 +02:00
Silversthorn	a9cdd33c77	Fixing Pylint Errors	2022-06-12 18:30:39 +02:00
Silversthorn	007218111f	Should work now :)	2022-06-12 17:13:39 +02:00
Silversthorn	430f9f9fcf	It might do the refresh after a server update	2022-06-12 08:37:24 +02:00
amcmanu3	ddcd3dc5c3	Appease the linter	2022-06-11 17:46:36 -04:00
amcmanu3	e99cacfc53	Make call to controller and not stale object	2022-06-11 17:34:31 -04:00
Andrew	c924663ab3	Fix stack on server stop	2022-06-10 19:04:34 -04:00
Andrew	41cf247c5a	Appease black	2022-06-10 18:31:48 -04:00
Andrew	4a15a2331e	Fix error when stats job does not exist on kill	2022-06-10 18:29:47 -04:00
luukas	f343db1a30	Fix inconsistency on the jsonschema API endpoint	2022-06-10 00:10:54 +03:00
Silversthorn	51b1097a96	Fixing Stack when redirected from Unauthorized page	2022-06-08 21:42:25 +02:00
amcmanu3	d7606f4cc6	Fix user permissions issue	2022-06-06 17:04:45 -04:00
Andrew	8e23ba5bdb	Fix backup error if excluded dir doesn't exists.	2022-06-06 00:05:16 -04:00
Iain Powrie	0921616285	Merge branch 'bug/fix-3-import' into 'dev' ... Fix version3 imports See merge request crafty-controller/crafty-4!299	2022-06-05 20:10:59 +00:00
amcmanu3	e0fb4c6442	Fix version3 imports	2022-06-05 16:02:52 -04:00
Andrew	0df30d2f05	Fix typo in error message	2022-06-04 14:24:12 -04:00
amcmanu3	dd54a5f2c9	Mark update as complete when it fails	2022-06-03 16:04:12 -04:00
amcmanu3	aa44650a05	Fix windows file pathing	2022-06-03 15:53:29 -04:00
amcmanu3	ace79cad2f	Remove useless print statements	2022-06-03 15:53:20 -04:00
Zedifus	eaecb2f09b	Replace standard pseudo-random generators ... Resolves: `Bandit ID B311` [Standard pseudo-random generators are not suitable for security/cryptographic purposes.]	2022-06-03 14:05:26 +01:00
Iain Powrie	18ab2cd76d	Drop to less permissive mask for bedrock imports ... `Owner` of the file (which should be us) can r-w-e `Group` of the file can r-w `World` can do nothing. Sticky bit is still set.	2022-06-03 11:42:20 +00:00
Andrew	5e48b250fa	Fix api v1 bug with list servers	2022-06-02 09:40:43 -04:00
Andrew	98b364cd3e	Fix support logs validation	2022-06-02 08:57:36 -04:00
Andrew	8ff2d8437d	Fix permissions on server clone	2022-06-02 08:51:12 -04:00
Andrew	6b85620fec	Fix schedule tasks not being killed on restore	2022-06-02 08:23:42 -04:00
Andrew	5970895268	Fix resetting api_key	2022-06-02 08:23:28 -04:00
Andrew	fae4ff12ea	Fix general user support logs	2022-06-02 08:23:18 -04:00
Andrew	50872e2bb5	Remove active tasks when server is deleted	2022-06-02 07:34:34 -04:00
Andrew	b793016c03	Redefine how servers are served to panel_handler	2022-06-02 07:34:17 -04:00
Andrew	f2dec0c52b	Reset secret key on fresh start when db dumped	2022-06-02 07:33:43 -04:00
Andrew	273e2f465d	Only show authorized servers on role creation	2022-06-01 19:26:57 -04:00
Andrew	ec730a1694	Merge branch 'bug/pretzel-support-log-temp-cleanup' into 'dev' ... Cleanup temp dirs on support log creation See merge request crafty-controller/crafty-4!286	2022-06-01 22:33:52 +00:00
Andrew	ea2dd5b78f	Add self to parameters for non-static function	2022-06-01 18:31:31 -04:00
Andrew	8e0ccd4f94	Fix indexing for updates made on branch	2022-06-01 18:25:27 -04:00
Andrew	5d3badef2c	Cleanup temp dirs on support log creation	2022-06-01 17:54:58 -04:00
Silversthorn	9e4c8e99b1	Merge branch 'dev' into dev-StatsDBImprovement	2022-06-01 23:52:49 +02:00
Andrew	9864cecff1	Merge branch 'experimental/lukas-codebase-improvements' into 'dev' ... Lukas's codebase improvements See merge request crafty-controller/crafty-4!277	2022-06-01 20:22:47 +00:00
luukas	89b6e239bc	Merge branch 'dev' into experimental/lukas-codebase-improvements	2022-06-01 22:35:11 +03:00
Andrew	28ffbe4627	Remove unnecessary pass	2022-06-01 15:20:16 -04:00
Andrew	3946a926bf	Remove print statement	2022-06-01 15:17:13 -04:00
Andrew	fdc88451b9	Add exception for permissions in helpers check	2022-06-01 15:11:37 -04:00
Zedifus	de96844276	Remove useless return from a_backup_server ... (Pylint R1711)	2022-06-01 18:34:04 +01:00
Zedifus	256c6567fd	Remove temporary directory on backup completion ... When running backups, the temporary directory wasn't being properly removed. Added logic to remove the temporary directory upon backup completion, cleaned up the try/except a bit.	2022-06-01 18:28:24 +01:00
luukas	45a1b835fb	Fix server error checking in API stdin endpoint	2022-06-01 14:17:33 +03:00