1017 Commits

Author	SHA1	Message	Date
Silversthorn	eccac2508d	Fix Issue #255 ... Rework how the websockets are managed	2023-08-09 23:47:53 +02:00
amcmanu3	a1f0e7399f	Merge branch 'dev' into feature/discord-webhooks	2023-08-04 15:19:33 -04:00
amcmanu3	4e0743bc1f	Merge branch 'dev' into refactor/remote-comms-patch-2	2023-08-04 15:19:04 -04:00
Silversthorn	dd8b8b5cb9	Better Display for InApp Documentation	2023-08-02 19:26:39 +02:00
Andrew	fe2f86ac84	Add check for authorized servers on mobile.	2023-08-01 12:20:01 -04:00
bobsfriend12	d60a0cf908	decrease code density	2023-07-29 16:16:09 -05:00
bobsfriend12	e76ba70d88	get rid of cache	2023-07-29 16:05:27 -05:00
bobsfriend12	86960b7c9f	fix lint issues	2023-07-29 16:01:29 -05:00
Zedifus	1beb86bc8f	Merge branch 'dev' into bugfix/creation-formatting	2023-07-18 21:43:54 +01:00
Andrew	b23a08be5f	Add eula agree to api	2023-07-13 10:39:25 -04:00
Andrew	62e1069aeb	Merge branch 'dev' into refactor/remote-comms-patch-2	2023-07-13 10:17:19 -04:00
amcmanu3	76e1ee471a	Add backups API	2023-07-12 18:01:14 -04:00
amcmanu3	2f509b46ee	Merge branch 'refactor/remote-comms-patch-2' of gitlab.com:crafty-controller/crafty-4 into refactor/remote-comms-patch-2	2023-07-12 12:23:52 -04:00
amcmanu3	6a8fea3ff1	Add HTML form logic	2023-07-12 12:23:49 -04:00
amcmanu3	c82e0fe20a	Add semi-colon in js	2023-07-12 12:23:09 -04:00
Andrew	345fee7e5d	Add translation	2023-07-05 21:51:15 -04:00
Andrew	d2f56a6556	Add link to status page to login	2023-07-05 21:48:55 -04:00
Andrew	4e77611375	Remove ajax call for exclusions	2023-07-05 20:11:27 -04:00
Andrew	1b9e284f52	Change backup_now post for better error handling	2023-07-05 19:34:42 -04:00
bobsfriend12	cd3bb23808	get rid of offline	2023-07-05 15:41:17 -05:00
bobsfriend12	7f8feb8591	get rid of errors in console log	2023-07-05 15:34:35 -05:00
amcmanu3	e5e5d529ae	Fix text for public status page	2023-06-19 20:28:36 -04:00
Andrew	dd3ea0a094	Merge branch 'dev' into bugfix/creation-formatting	2023-06-18 14:26:24 -04:00
amcmanu3	f52635cab6	Fix format on serverjars warning	2023-06-14 19:19:10 -04:00
amcmanu3	c0fb5cf179	Add delete to front end	2023-06-05 18:20:45 -04:00
amcmanu3	2e58a2adc1	Remove files from ajax	2023-06-04 23:08:27 -04:00
amcmanu3	768d3c0d14	Move files request to files API	2023-06-04 20:55:48 -04:00
amcmanu3	1ff9bc9e83	Setup backup file trees through API	2023-06-04 14:43:45 -04:00
amcmanu3	a06f8664c2	Merge branch 'dev' into refactor/remote-comms-patch-2	2023-06-04 11:48:45 -04:00
amcmanu3	7db5f400ab	Add backup delete and restore functions to API	2023-06-04 11:42:08 -04:00
amcmanu3	2ebbb1fdab	Fix webhook patch	2023-06-03 22:40:39 -04:00
amcmanu3	14193d1233	Fix fonts	2023-06-03 18:44:18 -04:00
amcmanu3	dbc1067a0e	Add translations	2023-06-03 18:38:44 -04:00
amcmanu3	697c1392dc	Add webhooks to frontend	2023-06-03 18:10:39 -04:00
amcmanu3	0adc129462	Inital commit for webhooks on frontend	2023-06-03 13:36:38 -04:00
amcmanu3	fb2bcd7e4e	Fix permissions on webhooks nav	2023-06-03 12:22:10 -04:00
amcmanu3	7c72dfc241	Add webhook front end	2023-06-03 12:21:23 -04:00
amcmanu3	be5183260e	Fix banned players formatting	2023-05-30 14:06:41 -04:00
amcmanu3	9cb3b6829d	Fix formatting / enable dynamic loading	2023-05-30 00:02:11 -04:00
amcmanu3	a04771df34	Use a cache for players instead of reading file	2023-05-29 19:34:40 -04:00
Zedifus	56d6b3b3cd	Merge branch 'dev' into bugfix/task-command	2023-05-29 21:47:35 +01:00
Zedifus	b8192900c2	Merge branch 'dev' into bugfix/zip-upload	2023-05-29 21:29:36 +01:00
Andrew	4243c0fa94	remove scrollbars	2023-05-27 14:01:46 -04:00
Andrew	8aeea1bd49	Fix schedule custom commands	2023-05-27 13:57:26 -04:00
Andrew	a6d30d7242	Fix upload root files being hidden	2023-05-25 00:23:15 -04:00
Andrew	898744c39e	Remove old server commands ... Fix spelling	2023-05-23 19:56:41 -04:00
amcmanu3	438564fe0a	Merge branch 'dev' into tweak/server-jars-credit	2023-05-22 21:02:36 -04:00
Zedifus	da697be719	Merge branch 'dev' into bugfix/task-scheduling	2023-05-23 01:15:32 +01:00
amcmanu3	77eac1fdf5	Fix overflow issues in schedules for firefox	2023-05-22 17:19:34 -04:00
amcmanu3	5d685d7d9c	Change server path font size based on viewport	2023-05-22 17:10:50 -04:00
amcmanu3	eabe9575ae	Change execution command text size with viewport	2023-05-22 17:10:37 -04:00
amcmanu3	6fb581a12d	Cleanup JS	2023-05-22 17:04:23 -04:00
amcmanu3	9147fbb6f0	Fix server terminal font spacing	2023-05-22 16:58:02 -04:00
amcmanu3	e357adeb68	Add new serverjars logos	2023-05-22 16:45:17 -04:00
Andrew	ef3f60e180	Add command to default actions	2023-05-21 20:06:01 -04:00
Silversthorn	e90d6e8091	Merge branch 'dev' into tweak/improve-display	2023-05-18 09:53:23 +02:00
amcmanu3	53ba4fcf32	Move message to import dialogue	2023-05-17 16:21:21 -04:00
amcmanu3	03db0c5850	Improve error notifications. ... Fix remove server jar logo on error	2023-05-17 12:51:45 -04:00
amcmanu3	9d62477b0b	Add credit to server jars	2023-05-17 12:15:25 -04:00
Zedifus	73af3166f5	Merge branch 'dev' into refactor/wiki-links	2023-05-14 22:49:29 +01:00
Zedifus	5ef78dc144	Merge branch 'dev' into tweak/server-api-warning	2023-05-14 22:33:44 +01:00
Andrew	bcc4c3a142	Adjust docs url	2023-05-14 16:36:04 -04:00
Andrew	a8bba9a939	Replace wiki names with docs.	2023-05-14 16:31:19 -04:00
Zedifus	33557c026b	Merge branch 'dev' into enhancement/mobile-app	2023-05-14 20:55:42 +01:00
Andrew	d02fe1cb6c	Add translation	2023-05-14 14:35:23 -04:00
Andrew	3262b5fd15	Add grayscale warning over creation when api down	2023-05-14 14:23:06 -04:00
Andrew	9611e8539d	Add alert for API down	2023-05-14 13:59:47 -04:00
Andrew	6988ed31f6	Fix json schema type issues in schedules	2023-05-11 21:48:25 -04:00
amcmanu3	fb543fb148	Merge branch 'dev' into refactor/remote-comms-api	2023-05-07 13:49:53 -04:00
amcmanu3	9b3c664d09	Revert xsrf remove	2023-05-07 12:41:36 -04:00
Silversthorn	6bfcf9c871	Fixing Misplaced div	2023-04-15 21:29:02 +02:00
Silversthorn	8119c97927	Merge branch 'dev' into tweak/improve-display	2023-04-15 21:00:24 +02:00
Silversthorn	84a09ad9be	Improve player display	2023-04-15 20:47:35 +02:00
amcmanu3	7721b02786	Fix formatting	2023-03-15 11:17:39 -04:00
amcmanu3	7aa0776cb5	Laying groundwork for roles patch	2023-03-13 15:54:44 -04:00
Andrew	ef711fbd1d	Fix traceback for users without disks	2023-03-12 16:46:50 -04:00
Silversthorn	ad0e130b07	Merge branch 'dev' into tweak/improve-display	2023-03-12 10:43:50 +01:00
Andrew	d1b2955fcc	Better errors for schedules	2023-03-10 18:28:40 -05:00
Andrew	4729588e31	Fix server config update_url	2023-03-10 18:25:26 -05:00
bobsfriend12	a543390823	verify meta tags, remove console logs	2023-03-09 01:50:32 +00:00
bobsfriend12	22ab592126	manifest updates, make offline work better	2023-03-07 03:54:26 +00:00
bobsfriend12	014805fc31	add offline page,change sw location	2023-03-06 23:38:04 +00:00
bobsfriend12	18f7d82d04	change theme color	2023-03-05 21:14:57 -06:00
bobsfriend12	081ecb6fee	resolve merge conflicts	2023-03-05 21:02:05 -06:00
bobsfriend12	8844d8c989	update manifest and add service worker	2023-03-05 21:00:09 -06:00
Andrew	3c5ebdf6ba	More testing	2023-03-05 15:44:14 -06:00
Andrew	e5a16d0498	Updates	2023-03-05 15:44:14 -06:00
amcmanu3	f09e93a19f	poorly attempt to add "add to home" feature	2023-03-05 15:44:14 -06:00
amcmanu3	1804d35156	Add error checking on cron validation	2023-03-04 22:45:31 -05:00
amcmanu3	c02472fb16	Send schdules via API	2023-03-04 20:10:10 -05:00
amcmanu3	addd878942	Move schedule edit delete to API call	2023-03-04 18:19:30 -05:00
amcmanu3	8ac0449bcb	Add quick schedule delete to api call	2023-03-04 18:18:39 -05:00
amcmanu3	342f2376bc	Send server config form through API	2023-03-03 17:16:53 -05:00
amcmanu3	81e4e7e450	Fix command sends to server	2023-03-02 13:24:07 -05:00
amcmanu3	d473a6ccf4	Add server order to api call	2023-03-01 15:25:28 -05:00
amcmanu3	1b6c7dd478	Edit panel config for API	2023-03-01 13:30:21 -05:00
amcmanu3	cd475e0cf5	Use API to send remote commands to server	2023-03-01 13:04:51 -05:00
Zedifus	6e5138e736	Merge branch 'dev' into tweak/file-save-fa-6	2023-02-17 00:10:49 +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
amcmanu3	4d02ef1fc3	Fix file save status for fa 6	2023-02-13 13:28:21 -05:00
amcmanu3	dd317a3460	Only support changing server dir in non-docker env	2023-02-12 12:29:05 -05:00
Andrew	72a2ff4c40	Merge branch 'dev' into ... enhancement/add-storage-to-dash	2023-02-11 15:36:33 -08:00
Zedifus	e39e87824d	Merge branch 'dev' into tweak/front-end-translation-fa	2023-02-11 19:47:36 +00:00
Zedifus	c151e5f3a7	Merge branch 'dev' into tweak/master-server-dir-config	2023-02-11 19:47:01 +00:00
Iain Powrie	f6a5d587a3	Merge branch 'enhancement/ignored-exits' into 'dev' ... Add ignored exit codes for crash detection See merge request crafty-controller/crafty-4!553	2023-02-11 19:07:37 +00:00
Zedifus	fb26b4eeaf	Merge branch 'dev' into bug/dynamic-files-upload	2023-02-11 18:49:34 +00:00
Zedifus	fa6f17e347	Merge branch 'dev' into enhancement/ignored-exits	2023-02-11 18:33:48 +00:00
Zedifus	11af841d2b	Merge branch 'dev' into tweak/sidebar-server-limit	2023-02-11 18:25:14 +00:00
Zedifus	5b383d9fa9	Merge branch 'dev' into feature/upload-progress	2023-02-11 18:10:32 +00:00
amcmanu3	3714d2393d	Fix logical issue with uploading dynamic files	2023-02-10 16:07:59 -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	dd69ad066c	Trunkate sidebar servers to a max of 10	2023-02-10 13:35:22 -05:00
amcmanu3	d0e8148282	Fix tooltip update	2023-02-07 17:51:13 -05:00
Silversthorn	5b4639b839	Truncate the too long lines and add Tooltip	2023-02-07 23:20:24 +01:00
Silversthorn	8b48d73a85	Inprove Storage Display	2023-02-07 19:56:13 +01:00
amcmanu3	5d5f0eaaa5	Create table for display ... Add translations	2023-02-05 20:11:21 -05:00
amcmanu3	f381562b3b	Make monitored mount points user configurable	2023-02-05 19:05:20 -05:00
amcmanu3	f824ca2959	Dynamically update storage on host stats	2023-02-05 18:03:36 -05:00
amcmanu3	f00182e8e9	Remove extra </li>	2023-02-05 17:06:29 -05:00
amcmanu3	b224103778	Add storage to the dashboard	2023-02-05 16:47:12 -05:00
Silversthorn	d9abf0ef4d	Adding icones	2023-02-04 15:59:09 +01:00
Silversthorn	08e600b69c	Adding Mobile Display for config menu	2023-02-04 10:50:44 +01:00
amcmanu3	edddfca8bc	Fix spacing on moble server controls	2023-02-03 18:24:42 -05:00
amcmanu3	ca0a53b326	Add translations to Crafty Config Page and wizard	2023-02-03 16:00:13 -05:00
amcmanu3	6b5ec51887	Upgrade to fontawesome6	2023-02-03 15:59:52 -05:00
Silversthorn	15fee87709	Improving display for hidden parts	2023-02-02 23:48:12 +01:00
Silversthorn	137ae3041f	Improving Forms Displays for upload files and server creation	2023-02-02 23:47:54 +01:00
amcmanu3	c22a073f2f	Add space after gear	2023-02-01 17:34:07 -05:00
amcmanu3	bb482b8381	Use response text for errors on uploads. ... Overhaul	2023-02-01 17:09:39 -05:00
amcmanu3	20ce8996d7	Add better upload feedback for users	2023-02-01 15:43:17 -05:00
amcmanu3	238b8da4d9	Add upload progress bar for file uploads	2023-02-01 15:31:43 -05:00
Silversthorn	7949db65ac	Improving Switches on Config Server Page	2023-01-31 20:20:08 +01:00
amcmanu3	d160054bb3	Add translations	2023-01-30 23:32:45 -05:00
amcmanu3	819e84ec4c	Translate additions to backups page	2023-01-30 23:27:40 -05:00
amcmanu3	e43c63a8b7	Fix db not found issue ... Add page feedback.	2023-01-30 18:31:46 -05:00
amcmanu3	d273589f2e	Fix front end	2023-01-30 17:23:25 -05:00
amcmanu3	73233181be	Fix typo on front end	2023-01-30 15:39:09 -05:00
amcmanu3	552ed8a5a6	Append /servers/ on the input field	2023-01-30 15:30:11 -05:00
amcmanu3	863ded782a	Add move servers dir functionality	2023-01-30 15:23:10 -05: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	af654bc89f	Make the color look nicer	2023-01-29 17:25:44 -05:00
amcmanu3	d24c3c5ba0	Add red color to reset values	2023-01-29 17:05:17 -05:00
amcmanu3	040536f320	Merge branch 'dev' into bugfix/file-tree-reload	2023-01-29 15:13:02 -05:00
amcmanu3	3c2b2e8a87	Add better feedback for files that finish upload	2023-01-28 21:50:45 -05:00
amcmanu3	d31a0a0512	Fix root directory uploads	2023-01-28 20:35:58 -05:00
amcmanu3	e0541b1ec0	Change file tree doesn't reload on upload/delete	2023-01-28 19:10:27 -05:00
Silversthorn	d01dfe40db	Merge branch 'dev' into enhancement/config-json	2023-01-28 01:37:41 +01:00
Zedifus	e217c63fdf	Merge branch 'dev' into bug/ReworkDefautPublicHandler	2023-01-27 19:59:12 +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
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
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
Silversthorn	03d236f1a0	Enhance Visual for the selectpicker	2023-01-21 09:53:46 +01:00
Andrew	cf9ad77879	Add option to run command before backup	2023-01-20 17:35:30 -05:00
amcmanu3	2e810b1544	Fix button covers	2023-01-19 16:20:23 -05:00
amcmanu3	04f7876e9f	Add selectpicker. Make select look nicer	2023-01-19 14:09:21 -05:00
amcmanu3	dfa2f5fb1e	Remove antequeted code after moving from db	2023-01-19 11:28:00 -05:00
Andrew	868b324547	Black config_json. Add feedback on submit	2023-01-18 18:00:50 -05:00
Silversthorn	ba415c1168	Fixing display of dropdown select	2023-01-18 22:44:26 +01:00
Silversthorn	caf7dd2fac	Improving enable of all languages	2023-01-18 22:42:17 +01:00
Silversthorn	4573feaa9a	Merge branch 'dev-transparent-login' of gitlab.com:crafty-controller/crafty-4 into dev-transparent-login	2023-01-18 22:17:03 +01:00
Silversthorn	c0fff12f39	Fix center position for login background to center	2023-01-18 22:16:51 +01: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	71c5d46296	Improving Login Display in Panel Config	2023-01-17 22:02:37 +01:00
Silversthorn	9fc7a0523e	Improve display of the login form on settings	2023-01-17 21:48:17 +01:00
Silversthorn	7984ca8157	Add Personalized Transparency for Login Page's Form	2023-01-17 20:40:16 +01:00
Andrew	dc7b682ce6	Fix merge conflict issues	2023-01-15 19:09:29 -05:00
Andrew	07220f68bf	Merge branch 'enhancement/config-json' of gitlab.com:crafty-controller/crafty-4 into enhancement/config-json	2023-01-15 18:58:28 -05:00
Andrew	8d8b065e41	Working config.json from page	2023-01-15 18:57:22 -05:00
amcmanu3	99ccfb2228	Remove submit function	2023-01-14 22:24:20 -05:00
amcmanu3	f9064eb15f	Turn it into a list for a fresh start at this	2023-01-14 22:22:37 -05:00
Andrew	bea48d9059	Add better formatting for lists.	2023-01-10 14:12:33 -05:00
Silversthorn	3c11f0120d	Rework panel config for login page	2023-01-10 00:53:47 +01:00
Andrew	4f4ec16a9b	Make config editable from Crafty	2023-01-09 18:52:45 -05:00
Andrew	1daaecc790	Remove un-needed log messages	2022-12-29 19:05:55 -05:00
amcmanu3	60e393d7cf	Make qol changes to startup warning	2022-12-28 00:20:06 -05:00
Andrew	47e2635b20	Set a timeout on server launch to display warn	2022-12-27 09:45:39 -05:00
Zedifus	2889c060e6	Merge branch 'dev' into tweak/server-port-explained	2022-12-21 16:11:13 +00:00
Andrew	ec50a80e1f	Add warning icon	2022-12-19 19:48:15 -05:00
Andrew	7f629d21e9	Update translation ... Make it so warning appears all the time	2022-12-19 19:42:40 -05:00
Andrew	0bd4dd7e69	Add popover to server port to explain it's purpose	2022-12-19 18:42:05 -05:00
Andrew	a1e8b7afe7	Make server directories non-configurable	2022-12-17 12:21:15 -05:00
Andrew	c74aeb5dde	Fix id mismatch zip upload import	2022-12-15 18:48:15 -05:00
Zedifus	c2f086554c	Merge branch 'dev' into bug/status-page-colors	2022-12-07 13:44:53 +00:00
Zedifus	d127fc6e3d	Merge branch 'dev' into bug/plus-sign-path	2022-12-07 13:33:19 +00:00
Andrew	4baaec8752	Fix colors on public pages.	2022-12-02 13:06:10 -05:00
Andrew	48a6f98cb5	Fix port not showing on dash while server online	2022-11-30 21:50:55 -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
Zedifus	58d32ca4de	Merge branch 'dev' into enhancement/dashboard-port	2022-11-30 20:51:52 +00:00
Andrew	2782e927d7	Add port tooltip over status on dash	2022-11-28 19:45:53 -05:00
Andrew	4e17c1ea5e	Add installing status	2022-11-19 15:45:29 -05:00
Andrew	e42af36103	Make sure import status persists through install	2022-11-19 14:41:15 -05:00
amcmanu3	bf0255a26b	Add custom login image feature	2022-11-09 14:13:35 -05:00
Zedifus	5a2dc555f8	Merge branch 'dev' into feature/log-filter	2022-10-22 20:45:24 +01:00
Zedifus	1f2ff2345d	Rename functions for readability	2022-10-22 19:43:59 +01:00
Zedifus	2599658321	Fix word list display on page load ... Whoopsie	2022-10-22 19:37:16 +01:00
Zedifus	cb6e034f30	Guard against duplicate filters ... This protects against adding multiple filters of the same thing	2022-10-22 19:28:13 +01:00
Zedifus	f3e41861d2	Remove guard on whitspace ... We can just trim instead	2022-10-22 19:24:06 +01:00
Zedifus	a2a8b6449f	Tidy comments and declaration order ... Declare functions before the function that uses it	2022-10-22 19:04:57 +01:00
Zedifus	eaf5ae3664	Tidy turbo long lines for scroll-less readability	2022-10-22 18:50:48 +01:00
Zedifus	fd906d56e8	Clear input field after we've grabbed the value ... Reduce repetition of code	2022-10-22 18:18:00 +01:00
Zedifus	1217f93c05	Hoist sanatise declaration ... Function should be declared before trhe functions that use it, not after	2022-10-22 18:11:54 +01:00
Zedifus	6437f4fbd5	Break up if/else into guard clauses	2022-10-22 18:08:35 +01:00
amcmanu3	34cda5a081	Fix backups refresh causing issues on firefox	2022-10-21 16:48:51 -04:00
Andrew	4707489310	More regex	2022-10-20 14:12:51 -04:00
Andrew	241a33542b	Fix JS breaking symbols	2022-10-20 13:52:16 -04:00
Andrew	e576a69d39	Merge branch 'feature/log-filter' of gitlab.com:crafty-controller/crafty-4 into feature/log-filter	2022-10-20 10:04:45 -07:00
Andrew	cbe7ad9a39	Change variable naming to make more sense	2022-10-20 10:01:20 -07:00
Iain Powrie	b21d0d82f2	Apply 5 suggestion(s) to 1 file(s)	2022-10-18 04:22:06 +00:00
Andrew	3b813a6849	Fix splice error	2022-10-13 00:01:53 -04:00
Andrew	ec746d2131	Fix duplicate word bug ... Fix delete bug	2022-10-12 23:55:25 -04: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	fbb6dad524	Merge branch 'dev' into tweak/themes	2022-10-08 18:12:37 +01:00
Zedifus	21d119d58e	Merge branch 'dev' into dev-fixed-sidebar-V2	2022-10-06 18:48:57 +01:00
Silversthorn	905be275ed	Add Collapse Memory for sidebar on LargeBreakpoint	2022-10-06 07:52:24 +02:00
Silversthorn	002d89934e	I hope this time it's ok, the sidebar works as intended	2022-10-04 23:58:31 +02:00
Silversthorn	425cb3869b	Fixing scrolling sidebar even when collapsed	2022-10-04 23:10:03 +02:00
Silversthorn	d87a2c4c17	Revert "Fix scrolling of sidebar" ... This reverts commit 99693324dc.	2022-10-04 23:03:42 +02: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	4d74a1e3c0	Merge branch 'dev' into bug/zip-import-conditional	2022-10-03 22:26:22 +01:00
amcmanu3	03320c375a	Fix conditional issue with zip imports/uploads	2022-10-03 15:38:45 -04:00
Silversthorn	99693324dc	Fix scrolling of sidebar	2022-10-03 18:48:49 +02: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
Andrew	dc218eb9d5	Remove java specific settings from bedrock upload	2022-09-28 18:23:12 -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	31a8366186	Fix tooltip colors	2022-09-26 21:41:22 -04:00
Andrew	3d82b61007	Add comments to CSS file. ... Update ronald theme	2022-09-26 21:34:54 -04:00
Andrew	3eb87209de	Fix color issues with dropdown	2022-09-26 21:24:00 -04:00
Andrew	a5a81aa22a	Add themes to users page/base	2022-09-26 21:23:47 -04:00
Andrew	95188a053d	Fix navigation colors	2022-09-25 22:36:17 -04:00
Andrew	c7a292a662	Fix notification color	2022-09-25 22:23:37 -04:00
Andrew	baa441d427	Add light. Fix login	2022-09-25 22:18:36 -04:00
Andrew	ca91debea1	Set base.html origin back to default	2022-09-25 17:52:24 -04:00
Andrew	e6121b06a6	Add dark mode. Refactor code to accept themes	2022-09-25 17:52:01 -04:00
Andrew	d7de340807	Initial commit for themes/black	2022-09-25 12:45:22 -04:00
amcmanu3	084cb8b71c	Fix scrollable term issue on startup	2022-09-19 20:17:02 -04:00
Zedifus	2b36fbd448	Merge branch 'dev' into tweak/reaction-schedules	2022-09-19 22:50:55 +01:00
Zedifus	518eb6af23	Merge branch 'dev' into bug/gravatar-fetch	2022-09-19 22:18:11 +01:00