Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,657 Commits 12 Branches 45 Tags 104 MiB
a112bc3e57
Commit Graph

2454 Commits

Author SHA1 Message Date
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
Andrew
fb16be6a64 Add index handlers (aware of the lint issue) 2023-05-20 17:49:51 -04:00
Andrew
e6723d9ebc Add new backup routes 2023-05-20 17:49:13 -04:00
Silversthorn
e90d6e8091 Merge branch 'dev' into tweak/improve-display 2023-05-18 09:53:23 +02:00
amcmanu3
a0abc6819b Initial webhook integration 2023-05-17 19:05:59 -04: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
cbfa40ce8d Prepare 4.1.1 release base 2023-05-15 03:36:05 +01:00
Iain Powrie
194228afbf Merge branch 'tweak/restore-server-path' into 'dev' 
Retain pathing in execution command on restore.

See merge request crafty-controller/crafty-4!578
 2023-05-15 01:58:11 +00:00
Zedifus
ed6b0eb946 Fix check_address_status 2023-05-15 02:49:37 +01:00
Andrew
9aaf27ee6a Merge branch 'dev' into tweak/restore-server-path 2023-05-14 21:36:16 -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
Zedifus
5ffc241e0a Merge branch 'dev' into bugfix/project_root 2023-05-14 22:17:47 +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
Zedifus
d00b9fb4dd Merge branch 'dev' into bugfix/loop-detection 2023-05-14 20:37:09 +01:00
Zedifus
061baadc0c Merge branch 'dev' into bugfix/server-order 2023-05-14 20:21:14 +01:00
Zedifus
f6d24b4ca9 Merge branch 'dev' into refactor/remote-comms-api 2023-05-14 20:06:47 +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
Zedifus
6699a9a373 Re-tag release 
Due to the technical size of the api consolidation, minor bump required.
 2023-05-14 17:24:55 +01:00
Andrew
984d4dbf94 Fix dom issue 2023-05-11 21:56:31 -04:00
Andrew
6988ed31f6 Fix json schema type issues in schedules 2023-05-11 21:48:25 -04:00
Andrew
695b2d9d8c Fix project root error on first start. 2023-05-08 20:11:15 -04:00
amcmanu3
a35cec9d6c Retain pathing in execution command on restore. 2023-05-07 19:28:14 -04:00
amcmanu3
1ab409f5cb Add check for parent in schedules 2023-05-07 13:51:12 -04:00
amcmanu3
f22a6e77da Remove del task from ajax. 2023-05-07 13:50:26 -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
a911791737 Fixing Black 2023-04-15 20:58:29 +02:00
Silversthorn
b5abc93a8e Fixing Pipelines Issues 2023-04-15 20:55:46 +02:00
Silversthorn
84a09ad9be Improve player display 2023-04-15 20:47:35 +02:00
amcmanu3
0992e6288c Remove print comments 2023-04-12 13:04:57 -04:00
amcmanu3
3e8f04318c Remove print statements 2023-04-12 13:04:18 -04:00
amcmanu3
5542f792c8 Fix role server calculation 2023-04-12 13:03:44 -04:00
amcmanu3
b7ef960cf1 Add print statements for running 2023-04-12 12:42:39 -04:00
amcmanu3
58b9dc615d Major logic changes to fix this. 2023-04-12 12:14:37 -04:00
amcmanu3
146e9d7b60 Fix import loop detection. 2023-04-12 10:32:40 -04:00
amcmanu3
8eac424ab1 More debug data 2023-04-11 16:04:09 -04:00
amcmanu3
e321086f7f Adding print statements 2023-04-10 15:19:15 -04:00
Andrew
cc092d6ecb Fix type error comparrison 2023-04-09 16:10:53 -04:00
Andrew
7d8ade5d5e Fix this for unloaded servers 2023-04-09 07:34:22 -04:00
Andrew
7d804afe20 Make this more efficient 2023-04-08 20:33:11 -04:00
Andrew
d65f2f7111 Fix traceback on user order 2023-04-08 20:16:11 -04:00
Zedifus
8b528993b5 Prepare 4.0.23 release base 2023-04-08 18:17:35 +01:00
Zedifus
e0e631e1ec Merge branch 'dev' into bug/motd-obfuscation 2023-04-01 14:57:16 +01:00
Zedifus
f4b8685c8e Merge branch 'dev' into tweak/dashboard-storage 2023-04-01 14:43:54 +01:00
Zedifus
1be451d5eb Merge branch 'dev' into tweak/internet-ping 2023-04-01 14:32:37 +01:00
Andrew
fa87dcee1a Fix traceback for users without disks 2023-03-18 21:45:31 -04:00
amcmanu3
c5bb1f42e2 Add try/except around disk data 2023-03-18 15:27:08 -04:00
amcmanu3
dc4dc095c5 Fix motd jumping with obfuscation 2023-03-15 15:15:00 -04: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
amcmanu3
0b1d2d5dc6 Fix roles manager being none 2023-03-13 13:54:59 -04:00
Silversthorn
ad0e130b07 Merge branch 'dev' into tweak/improve-display 2023-03-12 10:43:50 +01:00
Andrew
3f3ba0ad81 Fix minimums 2023-03-10 18:58:19 -05:00
Andrew
d6b57203a1 Fix auto start delay patch 2023-03-10 18:55:13 -05: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
Andrew
6fa1b02888 Add better logging on tz failures 2023-03-09 11:09:58 -05:00
Andrew
89307cecd5 Fix get server users 2023-03-09 11:06:55 -05:00
bobsfriend12
a543390823 verify meta tags, remove console logs 2023-03-09 01:50:32 +00:00
amcmanu3
5ff14be92f Add a fallback for google.com 2023-03-08 18:46:06 -05:00
bobsfriend12
81ebb3fbed fix formatting 2023-03-07 13:26:01 +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
494b3442fb Merge branch 'dev' into refactor/remote-comms-api 2023-03-04 23:19:15 -05:00
amcmanu3
d06de3ef76 Remove un-needed imports 2023-03-04 22:45:45 -05: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
Zedifus
12fc3be00d Prepare 4.0.22 release base 2023-03-04 20:38:43 +00:00
amcmanu3
343b4c9da8 Merge branch 'dev' into refactor/remote-comms-api 2023-03-04 12:54:53 -05:00
Zedifus
c1c99f315b Merge branch 'dev' into bugfix/master-server-dir 2023-03-04 15:20:14 +00:00
Zedifus
87eb53d7d6 Merge branch 'dev' into bugfix/unloaded-server 2023-03-04 15:08:11 +00:00
Iain Powrie
ee747a314a Merge branch 'tweak/delete-crafty-logs' into 'dev' 
Crafty log clean up -config option

See merge request crafty-controller/crafty-4!563
 2023-03-04 15:03:42 +00:00
amcmanu3
ed028ec66d Add auth check on get 2023-03-03 19:14:44 -05:00
amcmanu3
71e9da50da Better format for finish 2023-03-03 18:47:36 -05:00
amcmanu3
1288b6afe6 Add and remove schdules through api 2023-03-03 18:23:44 -05:00
amcmanu3
3edf5d0a41 remove unused import 2023-03-03 17:32:27 -05:00
amcmanu3
c23bfdea8c Cleanup index 2023-03-03 17:31:29 -05:00
amcmanu3
7f11494d36 Remove server detail route from panel_handler 2023-03-03 17:17:13 -05:00
amcmanu3
342f2376bc Send server config form through API 2023-03-03 17:16:53 -05:00
amcmanu3
40bbc2e790 Remove print statement 2023-03-03 17:16:44 -05:00
amcmanu3
317ed3e667 only allow basic users rights to edit some fields 2023-03-03 17:16:20 -05:00
amcmanu3
39190ed43b Default to not delete logs 2023-03-02 13:40:45 -05:00
amcmanu3
a373943ae6 Cleanup ajax handler 
send audit log entry on stdin call
 2023-03-02 13:24:49 -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
c0381da880 Fix bug with unloaded server delete 2023-03-01 14:59:30 -05:00
amcmanu3
ec1076fbce Cleanup ajax handler 2023-03-01 14:40:02 -05:00
amcmanu3
c51d940234 Allow unloaded servers to be deleted API 2023-03-01 14:38:14 -05:00
amcmanu3
bd0c975009 Remove print statement 2023-03-01 14:30:59 -05:00
amcmanu3
566463cd55 Fix bug where "servers" was not appended 2023-03-01 14:22:33 -05:00
amcmanu3
efb9c9844f Fix bug where failed server could not delete 2023-03-01 13:35:36 -05:00
amcmanu3
1b6c7dd478 Edit panel config for API 2023-03-01 13:30:21 -05:00
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
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
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
4d02ef1fc3 Fix file save status for fa 6 2023-02-13 13:28:21 -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
b17b6484f7 Merge branch 'dev' into bugfix/world-size-calc 2023-02-11 16:01:52 -08: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
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
Zedifus
91df6730cf Merge branch 'dev' into bug/backup-tz 2023-02-11 19:10:45 +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
Zedifus
454f73c63e Merge branch 'dev' into refactor/cleanup-authentication-helpers 2023-02-11 18:03:08 +00:00
Zedifus
c8ea77c81a Merge branch 'dev' into bugfix/404-startup 2023-02-11 17:45:02 +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
3714d2393d Fix logical issue with uploading dynamic files 2023-02-10 16:07:59 -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
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
a6d1f7b62c Add realtime storage updates 2023-02-05 18:03:59 -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
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
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
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
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
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
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
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
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
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
3eeb00e524 Prepare 4.0.21 release base 2023-01-30 00:24:35 +00: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
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
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
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
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
Silversthorn
03d236f1a0 Enhance Visual for the selectpicker 2023-01-21 09:53:46 +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
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
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
27981619c4 Fix rollback table name 2023-01-19 11:57:11 -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
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
6f92d44d62 fixing messing with config.json file 2023-01-18 22:26:47 +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
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
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
Andrew
5d3dbc6f9c Fix security 2023-01-09 19:01:05 -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
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
Zedifus
d7d27b00c4 Prepare 4.0.20 release base 2023-01-07 18:56:13 +00:00
Iain Powrie
505d7321d3 Merge branch 'lang/create-czech-translation' into 'dev' 
Added Czech translation

See merge request crafty-controller/crafty-4!519
 2023-01-07 16:03:04 +00: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
a03f44144b Merge branch 'dev' into tweak/start-timeout-warning 2023-01-02 21:36:35 +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
1daaecc790 Remove un-needed log messages 2022-12-29 19:05:55 -05:00
Makhuta
6f76ad653f Add Czech translation 2022-12-28 16:03:58 +00: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
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
2889c060e6 Merge branch 'dev' into tweak/server-port-explained 2022-12-21 16:11:13 +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
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
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
Zedifus
cffa58da3b Merge branch 'dev' into bug/zip-server-upload 2022-12-17 00:07:15 +00: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
c74aeb5dde Fix id mismatch zip upload import 2022-12-15 18:48:15 -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
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
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
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
Zedifus
17744b72ae Prepare 4.0.19 release base 2022-12-01 01:18:40 +00:00
Zedifus
c5a888a2c0 Merge branch 'dev' into tweak/public-background 2022-12-01 01:03:26 +00: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
Zedifus
74f71606f3 Prepare 4.0.18 release base 2022-12-01 00:20:18 +00: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
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
2782e927d7 Add port tooltip over status on dash 2022-11-28 19:45:53 -05:00
Andrew
e8564566ed Appease the linter 2022-11-19 18:21:10 -05:00
Silversthorn
671a5188c2 Adding French Translations 2022-11-19 23:28:57 +01: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
4e17c1ea5e Add installing status 2022-11-19 15:45:29 -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
cd93b468b3 Prepare 4.0.17 release base 
Also remove badges from README, as gitlab already handles this in a different section
 2022-10-23 21:24:10 +01:00
Zedifus
5a2dc555f8 Merge branch 'dev' into feature/log-filter 2022-10-22 20:45:24 +01:00
Zedifus
ba968cfd71 Merge branch 'dev' into bug/backup-refresh 2022-10-22 20:39:05 +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
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
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
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
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
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
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
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
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
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
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
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
Zedifus
6688085292 Prepare 4.0.16 release base 2022-10-02 22:23:59 +01: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
dc218eb9d5 Remove java specific settings from bedrock upload 2022-09-28 18:23:12 -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
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
8e1534e268 Add arguments to API routes 2022-09-26 21:31:44 -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
05f08773a3 Add themes to users DB 2022-09-26 21:23:16 -04:00
Andrew
0cba81788e Add translation 2022-09-26 21:22:56 -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
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
Zedifus
8cada1c450 Prepare 4.0.15 release base 2022-09-23 03:36:15 +01:00
Andrew
e2c846205b self.clients was already a set. cannot subscript 2022-09-22 21:42:58 -04:00
Zedifus
ff78e711d0 Prepare 4.0.14 release base 2022-09-20 23:50:07 +01: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
084cb8b71c Fix scrollable term issue on startup 2022-09-19 20:17:02 -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
Zedifus
07941b7c3c Merge branch 'dev' into bug/js-errors 2022-09-19 21:57:43 +01:00
Zedifus
53be81dc08 Merge branch 'dev' into tweak/terminal-scroll 2022-09-19 21:47:52 +01:00
Zedifus
b93733c758 Merge branch 'dev' into tweak/debug-backup-logging 2022-09-19 21:39:14 +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
amcmanu3
17b6ec9fe3 Cleanup JS errors 2022-09-09 13:16:26 -04:00
Andrew
84838aae4d Fix vterm scroll logic when user is on bottom 2022-09-07 18:16:18 -04:00
Andrew
a0d921ffe3 Cleanup virtual term scroll 
Add scroll to bottom button when scrolled
 2022-09-07 18:02:49 -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 &amp; issues 2022-09-07 15:56:18 -04:00
Andrew
df7d10886e Fix &amp; with bleach 2022-09-07 14:55:40 -04:00
Andrew
1a9dd53ebe Remove roles url from href 
Fixes trace when clicking "roles config" tab while on roles config page.
 2022-09-07 13:48:18 -04:00
amcmanu3
1b2fef06fb Fix critical bug with unloaded servers 2022-09-05 23:15:07 -04:00
Zedifus
3e29e3c77c Prepare 4.0.13 release base 2022-09-05 01:20:21 +01:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
83834286fb Fix creation aesthetic 2022-09-04 18:27:45 -04:00
amcmanu3
e3cf2765f0 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-04 18:01:03 -04:00
amcmanu3
ab2e8cde0f Fix formatting on server creation page. 2022-09-04 18:01:00 -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
d568b7c664 Fix EULA message for legal reasons 
Make EULA message look prettier
 2022-09-01 14:18:04 -04: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