Commit Graph

2289 Commits

Author SHA1 Message Date
Andrew
ff1ba23830 Add updates to notifs 2023-09-02 19:35:16 -04:00
Silversthorn
a63c2dcf00 Removing saving data realtime => from 5s to 30s 2023-09-02 22:19:17 +02: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
Zedifus
7cad738259 Merge branch 'dev' into tweak/console-get-user 2023-09-02 15:55:48 +01:00
Iain Powrie
2a19e24a82
Merge branch 'refractor/remove-bleach' into 'dev'
Refractor/Replace bleach with nh3

See merge request crafty-controller/crafty-4!616
2023-09-02 14:06:26 +00:00
Zedifus
8569fb6f20 Merge branch 'dev' into bugfix/server-stats 2023-09-02 14:36:36 +01:00
Zedifus
4c7f95675b Merge branch 'dev' into enhancement/better-InApp-doc-display 2023-09-02 14:03:25 +01:00
Zedifus
8f5cb62c25 Merge branch 'dev' into bugfix/public-status-servers 2023-09-02 13:47:34 +01:00
Zedifus
e0b425c659 Merge branch 'dev' into bug-fix/service-worker 2023-09-02 13:28:57 +01:00
Wout Bouckaert
f50efcd6f4
Merge branch 'dev' into refractor/remove-bleach 2023-09-01 20:39:41 -06:00
Andrew
5266e6e098 style ul 2023-09-01 20:38:10 -04: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
f6c61e1764 Add bedrock request for files
TODO: Finish zip imports
2023-08-31 21:35:50 -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
amcmanu3
18252fae0f Fix naming issues with import server 2023-08-27 14:55:10 -04:00
Silversthorn
b67a38574c fixing black 2023-08-27 14:31:51 +02: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
7eb8e2bfd9 Add get users to crafty command 2023-08-24 13:02:44 -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
2847cab1d8 Zip imports by API v2 2023-08-17 16:46:35 -04:00
amcmanu3
470ab04bb2 Use API v2 for jar creation and jar import 2023-08-17 15:11:29 -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
e701fc1888 Edit values. Don't delete them all 2023-08-15 16:46:04 -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
79449082ff Put timeout to 10 seconds 2023-08-11 17:20:44 +02:00
Silversthorn
d172e9cd02 Forgot usefull functions 2023-08-11 11:32:38 +02:00
Silversthorn
372fd04948 Modifying the management of the webSocket when Out of Focus of Tab 2023-08-10 18:40:32 +02: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
Andrew
2c4b90964d Check for string response on server ping 2023-08-02 19:20:26 -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
834f6f3c3b Prepare 4.1.3 release base 2023-07-18 23:12:54 +01:00
Zedifus
1beb86bc8f Merge branch 'dev' into bugfix/creation-formatting 2023-07-18 21:43:54 +01:00
Zedifus
aa0824630a Merge branch 'dev' into refactor/in-file 2023-07-18 21:07:11 +01:00
Zedifus
a254a20082 Merge branch 'dev' into bugfix/schedule-enable 2023-07-18 20:55:22 +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
amcmanu3
41411b8c2d Remove unused import 2023-07-12 12:22:46 -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
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
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
Zedifus
5de11aec9a Prepare 4.1.3 release base 2023-06-18 19:07:19 +01:00
Andrew
6f506eecbd Add autofield to appease linter 2023-06-18 11:09:00 -04:00
Zedifus
dc33253a7f Update pl_PL lang
Thanks to discord user `terrariadlc`
2023-06-18 14:37:33 +01:00
Zedifus
cfee0a538b Update es_ES lang
Thanks to discord user `.lucyy_`, Welcome back!
2023-06-18 14:35:32 +01:00
Zedifus
1fd4a50828 Merge branch 'dev' into tweak/serverjars-bedrock 2023-06-18 14:04:10 +01:00
amcmanu3
f52635cab6 Fix format on serverjars warning 2023-06-14 19:19:10 -04:00
amcmanu3
73d2788aa0 Refactor all items using in_path for windows comp 2023-06-14 18:57:15 -04:00
Andrew
fd95abdf42 Remove bedrock servers in serverjars options 2023-06-06 20:44:59 -04:00
amcmanu3
c0fb5cf179 Add delete to front end 2023-06-05 18:20:45 -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
14193d1233 Fix fonts 2023-06-03 18:44:18 -04:00
amcmanu3
dbc1067a0e Add translations 2023-06-03 18:38:44 -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
697c1392dc Add webhooks to frontend 2023-06-03 18:10:39 -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
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
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
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
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
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
Andrew
178aba63dd Send empty json for no banned/cached players 2023-05-23 18:21:04 -04:00
Zedifus
993ba24b6b Prepare 4.1.2 release base 2023-05-23 03:09:47 +01: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
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
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