140 Commits

Author	SHA1	Message	Date
amcmanu3	3f3595acb4	Sort config.json in alphabetical order	2023-01-29 18:21:04 -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
amcmanu3	dfa2f5fb1e	Remove antequeted code after moving from db	2023-01-19 11:28:00 -05:00
Andrew	985178b993	Update zip import status	2023-01-02 14:26:42 -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
Zedifus	4543fcd03f	Merge branch 'dev' into feature/custom-login-background	2022-11-30 21:08:53 +00:00
Andrew	ad4603aafb	Add automated forge server creation installs	2022-11-19 13:45:18 -05:00
amcmanu3	bf0255a26b	Add custom login image feature	2022-11-09 14:13:35 -05:00
Zedifus	48b8b9d084	Merge branch 'dev' into refactor/config-json	2022-10-23 21:30:41 +01: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
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	2e212cc788	Add port constraint for all server creation & api	2022-10-04 15:55:52 -04:00
amcmanu3	a07eb58db7	Add bedrock server creation	2022-08-31 19:45:19 -04:00
Zedifus	51d123e9eb	Merge branch 'dev' into tweak/support-logs-zip-comment	2022-08-27 19:00:38 +01:00
Zedifus	1b4777fbab	Merge branch 'dev' into feature/pretzel-users-roles-manager	2022-08-27 17:25:49 +01: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
Andrew	cafa720bba	Fix server quotas. Removed un-used perms columns	2022-08-20 13:00:20 -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
amcmanu3	5cbb8f7018	Fix broken unloaded servers	2022-08-05 20:04:34 -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
Zedifus	31fe66776c	Merge branch 'dev' into incident/log-file-issues	2022-07-18 22:03:03 +01:00
amcmanu3	f265b070c0	Fix log file path issue for support log/log delete	2022-07-18 14:55:12 -04:00
Andrew	31ee894603	Add platform & crafty version info to support logs	2022-07-17 16:37:10 -04:00
amcmanu3	f1d11bfb0d	Remove tempdir from packaging logs.	2022-07-05 21:35:43 -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
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
amcmanu3	e3d289e6fd	Fix support logs download issues	2022-06-16 12:11:21 -04:00
luukas	e009ff9819	Use relative paths for the jarfile and logs	2022-06-16 02:10:26 +03:00
amcmanu3	50438c485b	Fix support log delete order. ... Fix username uppercase.	2022-06-14 15:42:13 -04:00
amcmanu3	b3f167ab62	Add fallback for tz not being found	2022-06-13 14:29:25 -04:00
Andrew	474597d16c	Add survery to admin first log	2022-06-12 17:03:42 -04: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	98b364cd3e	Fix support logs validation	2022-06-02 08:57:36 -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	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	5d3badef2c	Cleanup temp dirs on support log creation	2022-06-01 17:54:58 -04:00
Silversthorn	8f5c688b72	Fixing Pylint issues	2022-05-30 19:28:39 +02:00
Silversthorn	37bda32164	Fixing moved functions calls	2022-05-30 07:36:25 +02:00