Commit Graph

3965 Commits

Author SHA1 Message Date
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
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