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,356 Commits 12 Branches 45 Tags 104 MiB
882f241181
Commit Graph

1616 Commits

Author SHA1 Message Date
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
27cb3dc37a Remove backups delete/restore from ajax handler 2023-06-04 11:48:39 -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
eadb01d7c0 Add model option 2023-06-03 18:11:59 -04:00
amcmanu3
c9c953418b Add webhooks to panel handler 2023-06-03 18:11:50 -04:00
amcmanu3
5ebe135fae Alter webhook send 2023-06-03 18:11:29 -04:00
amcmanu3
210fc306c4 Add model option 2023-06-03 18:11:20 -04:00
amcmanu3
accbb89880 Add test webhook function 2023-06-03 18:11:00 -04:00
amcmanu3
0a2b8694ac Add webhook patch 2023-06-03 15:24:28 -04:00
amcmanu3
0877f650f4 Add api methods 2023-06-03 15:05:44 -04:00
amcmanu3
cbd988ee5b Add api routes 2023-06-03 15:05:33 -04:00
amcmanu3
f1ed96595d Add first monitored actions 2023-06-03 15:05:21 -04:00
amcmanu3
50c515b2aa Add database methods 2023-06-03 15:05:08 -04:00
amcmanu3
0adc129462 Inital commit for webhooks on frontend 2023-06-03 13:36:38 -04:00
amcmanu3
67a5e65b46 Remove webhooks 2023-06-03 13:36:20 -04:00
amcmanu3
cc157f86bb Setup webhooks database 2023-06-03 13:35:29 -04:00
amcmanu3
b15477ca4c Add providers 2023-06-03 12:19:05 -04:00
amcmanu3
e228f04345 Remove permissions work 2023-06-03 12:18:07 -04:00
amcmanu3
70ec609ebb Merge branch 'dev' into feature/discord-webhooks 2023-06-03 12:00:07 -04:00
amcmanu3
03cfdc0aa1 Add perms for webhooks 2023-06-03 12:00:03 -04:00
amcmanu3
88fe3146da Remove seconds from date/time 2023-05-30 00:01:54 -04:00
amcmanu3
a04771df34 Use a cache for players instead of reading file 2023-05-29 19:34:40 -04:00
Andrew
178aba63dd Send empty json for no banned/cached players 2023-05-23 18:21:04 -04:00
amcmanu3
fe2724d350 Set bedrock availablity to true always for now :) 2023-05-22 21:03:29 -04:00
amcmanu3
438564fe0a Merge branch 'dev' into tweak/server-jars-credit 2023-05-22 21:02:36 -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
03db0c5850 Improve error notifications. 
Fix remove server jar logo on error
 2023-05-17 12:51:45 -04: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
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
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
Andrew
3262b5fd15 Add grayscale warning over creation when api down 2023-05-14 14:23:06 -04:00
Andrew
984d4dbf94 Fix dom issue 2023-05-11 21:56:31 -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
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
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
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
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
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
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
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
014805fc31 add offline page,change sw location 2023-03-06 23:38:04 +00:00
bobsfriend12
8844d8c989 update manifest and add service worker 2023-03-05 21:00:09 -06: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
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
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
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
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