Commit Graph

949 Commits

Author SHA1 Message Date
Zedifus
65bea2a11a Merge branch 'dev' into feature/discord-webhooks 2023-09-21 23:42:04 +01:00
Andrew
6c1508f061 Remove extra handler 2023-09-19 18:35:41 -04:00
Silversthorn
1bf8f3bf44 Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-19 22:08:49 +02:00
Silversthorn
e9439ca154 Changing history units to hours 2023-09-19 21:46:31 +02:00
Zedifus
c0f07747a5 Merge branch 'dev' into tweak/refresh-handler 2023-09-19 19:24:55 +01:00
Andrew
8c2cfacb4e Use Jar naming schema for refresh 2023-09-08 20:27:47 -04:00
Silversthorn
99ef2db016 Adding host stats to the API 2023-09-06 23:28:46 +02:00
Andrew
096de18c2c Merge branch 'dev' into feature/discord-webhooks 2023-09-05 20:39:20 -04:00
Silversthorn
083e7b2f3f Fixing Little Rename Issue 2023-09-05 23:16:53 +02:00
Silversthorn
618094aa3e Removing useless BaseWebSocketHandler 2023-09-05 23:08:40 +02:00
Silversthorn
a0b069c9ef Reverting Public/Auth websocket 2023-09-05 23:00:52 +02:00
Silversthorn
c7ea7fbc6b Appease Black 2023-09-05 20:37:52 +02:00
Silversthorn
02b7cb8205 appease linter 2023-09-05 20:27:02 +02:00
Silversthorn
2d77c456ca Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-05 20:05:12 +02:00
Wout Bouckaert
23ff88e013
🖤 Format 2023-09-04 21:59:24 -06:00
Wout Bouckaert
751beaa7eb
Replace all instances of bleach with nh3.
Using latest version of nh3.
2023-09-04 20:44:44 -06:00
amcmanu3
2c14a3fd2c Appease the linter 2023-09-04 21:39:40 -04:00
amcmanu3
514bf8453f Appease sonar 2023-09-04 21:21:59 -04:00
amcmanu3
3c5560d3e2 Merge branch 'dev' into feature/arcadia-notifications 2023-09-04 20:38:33 -04:00
amcmanu3
4051d98f8f Appease the linter 2023-09-04 20:28:55 -04:00
amcmanu3
84a24687d0 Appease the linter 2023-09-04 19:38:20 -04:00
amcmanu3
9d26a8ff8d Make sonar changes 2023-09-04 19:22:11 -04:00
amcmanu3
3cb18f2da4 Make if more comprehensive 2023-09-04 18:44:17 -04:00
amcmanu3
24f9b64d59 Add default photo variable to appease sonar 2023-09-04 18:42:29 -04:00
amcmanu3
73c4adbdbf Appease the linter 2023-09-04 18:24:10 -04:00
amcmanu3
e716198af4 Appease the linter 2023-09-04 18:19:29 -04:00
amcmanu3
6574a557ff Remove ajax handler references 2023-09-04 14:12:27 -04:00
amcmanu3
52d0d5fc09 Remove ajax handler 2023-09-04 13:54:59 -04:00
amcmanu3
10f696edcc Make server logs call API 2023-09-04 13:54:24 -04:00
amcmanu3
76526916eb Add customize to handlers 2023-09-04 13:31:05 -04:00
amcmanu3
e79f33fcc4 Add login photo to API v2 2023-09-04 13:30:48 -04:00
amcmanu3
61699d6a27 Remove remaining post from AJAX 2023-09-04 13:30:31 -04:00
amcmanu3
78b689b7ec Fix security issue in logical expression 2023-09-04 12:53:06 -04:00
amcmanu3
adaaff3d23 Add master server dir to API v2 2023-09-04 12:34:39 -04:00
amcmanu3
153781c78e Add cache refresh to api v2 2023-09-04 12:12:02 -04:00
amcmanu3
db20d5ea7f Remove post handlers server handler 2023-09-04 11:45:11 -04:00
amcmanu3
a6b7b84b3b Add get/delete functions for api keys 2023-09-04 11:42:07 -04:00
amcmanu3
2f69464e7a Remove remaining get/delete calls in panelhandler 2023-09-04 11:41:45 -04:00
amcmanu3
6a4a9f77d9 Add create new API key from api v2 2023-09-03 23:30:26 -04:00
amcmanu3
cd4bd681d9 Remove antiquaed functions from ajax_handler 2023-09-03 16:17:26 -04:00
amcmanu3
0a99261f5a Remove antiquated file_handler 2023-09-03 16:16:07 -04:00
amcmanu3
afb7b91b7a Add files functions to API v2 2023-09-03 16:15:38 -04:00
amcmanu3
7ff77c598f Add upload support for apiv2
This should get changed once upload handler is gone.
2023-09-03 13:22:48 -04:00
amcmanu3
1898fd1945 Squash upload bug created in commit 27f6c4c 2023-09-03 13:22:17 -04:00
Silversthorn
eb6d9560f8 Implementations of Prometheus Client 2023-09-03 16:04:28 +02:00
Andrew
5e4560c461 Remove from ajax handler 2023-09-02 19:35:25 -04:00
Andrew
ff1ba23830 Add updates to notifs 2023-09-02 19:35:16 -04:00
Silversthorn
af1fdb447a Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-02 21:55:51 +02:00
Silversthorn
34fe9c1326 Using API Call for Status Page 2023-09-02 21:51:28 +02:00
Andrew
9d870f0611 Check for valid uuid 2023-09-01 20:15:33 -04:00
Andrew
f03e8d48a2 Appease the linter 2023-09-01 17:04:56 -04:00
Andrew
02df6de6d5 Remove prints. Remove test notif 2023-09-01 14:54:38 -04:00
Andrew
6c1e1b4737 Add Arcadia Notifications to Front end 2023-09-01 14:48:20 -04:00
amcmanu3
27f6c4c926 Add unzip/dir request handler to api v2 2023-08-31 21:35:30 -04:00
amcmanu3
d9e405e56c Add eula to download 2023-08-27 14:55:21 -04:00
Silversthorn
58cdfe9ee5 Fixing Black issues 2023-08-27 14:10:20 +02:00
Silversthorn
29f7399708 Adding API route for history stats
Fixing close db connexion for stats
2023-08-27 13:50:22 +02:00
amcmanu3
4f7d18362c Add download server option for bedrock servers 2023-08-25 13:54:31 -04:00
Andrew
14c0065124 Edit API handler to thread server creation. (Untested) 2023-08-23 20:44:11 -04:00
Andrew
52e44f090e Add audit log end point 2023-08-20 17:03:01 -04:00
Andrew
a8894757cf Rename activity logs 2023-08-20 17:01:32 -04:00
amcmanu3
61057bce81 Remove step 1 handling 2023-08-17 17:18:09 -04:00
amcmanu3
a90dd546a1 Add role detection to creation 2023-08-17 17:14:51 -04:00
amcmanu3
4358a78e93 Require category. Not eula 2023-08-17 15:11:11 -04:00
amcmanu3
134b35b2dd Setup users for API handling 2023-08-16 18:00:00 -04:00
amcmanu3
481eff9486 Remove send_order from ajax handler 2023-08-16 13:41:18 -04:00
amcmanu3
d6dd30b685 Remove delete method from panel handler 2023-08-16 13:38:10 -04:00
amcmanu3
6f535a11b0 Use API to make/edit roles 2023-08-16 13:34:52 -04:00
amcmanu3
36e500fda5 Remove config.json from panel handler 2023-08-15 16:47:55 -04:00
amcmanu3
185702169a Make keywords an array 2023-08-15 16:29:53 -04:00
amcmanu3
93428b2e05 Use API for config.json 2023-08-15 16:09:06 -04:00
Wout Bouckaert
ad9042e88f
Replace bleach with nh3. 2023-08-12 21:53:26 -06:00
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
Zedifus
aa0824630a Merge branch 'dev' into refactor/in-file 2023-07-18 21:07:11 +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
41411b8c2d Remove unused import 2023-07-12 12:22:46 -04:00
Andrew
4e77611375 Remove ajax call for exclusions 2023-07-05 20:11:27 -04:00
Andrew
6396c3079e Include self in method call 2023-07-04 15:02:47 -04:00
Andrew
45b0264499 Fix enabling schedules from schedule list 2023-07-04 12:10:59 -04:00
amcmanu3
a00ea06b9f Merge branch 'dev' into refactor/in-file 2023-06-27 00:48:21 -04:00
amcmanu3
73d2788aa0 Refactor all items using in_path for windows comp 2023-06-14 18:57:15 -04:00
amcmanu3
ad7ba9d6a7 Fix logical issue 2023-06-05 18:20:37 -04:00
amcmanu3
4ef31864ca Add delete file 2023-06-05 18:03:06 -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
12088f1332 Fix response data 2023-06-04 17:47:56 -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
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
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
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
0adc129462 Inital commit for webhooks on frontend 2023-06-03 13:36:38 -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
a04771df34 Use a cache for players instead of reading file 2023-05-29 19:34:40 -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
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
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
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
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
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
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
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