Commit Graph

2289 Commits

Author SHA1 Message Date
amcmanu3
cdba8c5c69 Appease sonar security 2023-09-04 20:10:00 -04:00
amcmanu3
c1d0902ea5 Appease sonar 2023-09-04 20:05:25 -04:00
amcmanu3
3467c1ccd6 Appease sonar 2023-09-04 19:48:03 -04:00
amcmanu3
097421b34f Appease sonar 2023-09-04 19:45:39 -04:00
amcmanu3
8e1e7f8e11 Appease sonar 2023-09-04 19:43:15 -04:00
amcmanu3
46d7c3eb3c appease sonar 2023-09-04 19:41:59 -04:00
amcmanu3
7134eb2eb8 Appease sonar 2023-09-04 19:40:27 -04:00
amcmanu3
84a24687d0 Appease the linter 2023-09-04 19:38:20 -04:00
amcmanu3
d3df67ba75 Appease Sonar 2023-09-04 19:35:48 -04:00
amcmanu3
9c9f9d3556 Fix file get naming 2023-09-04 19:32:56 -04:00
amcmanu3
fe5e7e8851 Appease sonar 2023-09-04 19:22:32 -04:00
amcmanu3
9d26a8ff8d Make sonar changes 2023-09-04 19:22:11 -04:00
Iain Powrie
81d6357596
Revert "Merge branch 'refractor/remove-bleach' into 'dev'"
This reverts merge request !616
2023-09-04 23:13:13 +00: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
157b066518 Appease sonar security 2023-09-04 18:31:46 -04:00
amcmanu3
b8210b1a07 Remove sonar "bugs" 2023-09-04 18:26:04 -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
4cd8e540f7 Revert "Poll notifications on an hourly schedule"
This reverts commit 98720aa072.
2023-09-04 17:46:22 -04:00
amcmanu3
98720aa072 Poll notifications on an hourly schedule 2023-09-04 17:30:47 -04:00
amcmanu3
bc71e4e5fd Force cache refresh on reload 2023-09-04 14:19:21 -04:00
amcmanu3
6574a557ff Remove ajax handler references 2023-09-04 14:12:27 -04:00
amcmanu3
977da1049d Had to remove a line somewhere 2023-09-04 14:00:34 -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
16e01aed85 Remove ajax notif 2023-09-04 13:31:15 -04:00
amcmanu3
76526916eb Add customize to handlers 2023-09-04 13:31:05 -04:00
amcmanu3
a73063f279 Fix bug on master server dir 2023-09-04 13:30:56 -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
Andrew
13539d83a9 add style 2023-09-03 17:27:09 -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
Andrew
92a9fffafc Make update notif point to release notes 2023-09-03 15:26:13 -04:00
Andrew
859a1737f3 Change link to json 2023-09-03 15:26:04 -04:00
amcmanu3
90905a70f5 General bug fixes/upload support 2023-09-03 13:23:18 -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
amcmanu3
a983cc8868 Squash bugs in java imports/bedrock imports 2023-09-03 13:20:02 -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
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