Commit Graph

3255 Commits

Author SHA1 Message Date
amcmanu3
a983cc8868 Squash bugs in java imports/bedrock imports 2023-09-03 13:20:02 -04: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
Iain Powrie
57dc58099b
Merge branch 'tweak/console-get-user' into 'dev'
Add get users to crafty command

See merge request crafty-controller/crafty-4!620
2023-09-02 15:03:28 +00:00
Zedifus
1fd0ac7581 Update changelog !620 2023-09-02 15:57:09 +01:00
Zedifus
7cad738259 Merge branch 'dev' into tweak/console-get-user 2023-09-02 15:55:48 +01:00
Zedifus
36afb3b797 Update changelog !616 2023-09-02 15:17:09 +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
Iain Powrie
242ba7899b
Merge branch 'bugfix/server-stats' into 'dev'
Check for string response on server ping

See merge request crafty-controller/crafty-4!614
2023-09-02 13:44:44 +00:00
Zedifus
ce6e8ea538 Update changelog !614 2023-09-02 14:38:22 +01:00
Zedifus
8569fb6f20 Merge branch 'dev' into bugfix/server-stats 2023-09-02 14:36:36 +01:00
Zedifus
5f088c4a1c Bump tornado to resolve #269 2023-09-02 14:24:40 +01:00
Zedifus
d61da42fa9 Bump crypto to resolve #267 & #268 2023-09-02 14:17:44 +01:00
Iain Powrie
99a635658d
Merge branch 'enhancement/better-InApp-doc-display' into 'dev'
Better Display for InApp Documentation

See merge request crafty-controller/crafty-4!613
2023-09-02 13:11:36 +00:00
Zedifus
b2cab357be Update changelog !613 2023-09-02 14:05:00 +01:00
Zedifus
4c7f95675b Merge branch 'dev' into enhancement/better-InApp-doc-display 2023-09-02 14:03:25 +01:00
Iain Powrie
0eab07db62
Merge branch 'bugfix/public-status-servers' into 'dev'
Add check for authorized servers on mobile.

See merge request crafty-controller/crafty-4!612
2023-09-02 13:02:09 +00:00
Zedifus
1786562a19 Update changelog !612 2023-09-02 13:48:23 +01:00
Zedifus
8f5cb62c25 Merge branch 'dev' into bugfix/public-status-servers 2023-09-02 13:47:34 +01:00
Iain Powrie
3fd3afb9c4
Merge branch 'bug-fix/service-worker' into 'dev'
Bug fix/service worker

See merge request crafty-controller/crafty-4!607
2023-09-02 12:43:28 +00:00
Zedifus
eec70dd894 Update changelog !607 2023-09-02 13:32:28 +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
Wout Bouckaert
1e159d5f0d
Merge remote-tracking branch 'upstream/dev' into dev 2023-09-01 20:38:23 -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
2cd0b527d9 Fixing last vulnerability 2023-08-27 14:41:25 +02:00
Silversthorn
5c6407d300 Fixing vulnerabilities 2023-08-27 14:40:28 +02: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