Commit Graph

4066 Commits

Author SHA1 Message Date
99ef2db016 Adding host stats to the API 2023-09-06 23:28:46 +02:00
096de18c2c Merge branch 'dev' into feature/discord-webhooks 2023-09-05 20:39:20 -04:00
083e7b2f3f Fixing Little Rename Issue 2023-09-05 23:16:53 +02:00
618094aa3e Removing useless BaseWebSocketHandler 2023-09-05 23:08:40 +02:00
a0b069c9ef Reverting Public/Auth websocket 2023-09-05 23:00:52 +02:00
c7ea7fbc6b Appease Black 2023-09-05 20:37:52 +02:00
02b7cb8205 appease linter 2023-09-05 20:27:02 +02:00
2d77c456ca Merge branch 'dev' into bugfix/issue_255_status_page_update 2023-09-05 20:05:12 +02:00
f47e50eac1 Fix order to be alphabetical 2023-09-05 11:12:56 -06:00
645e11f4a8 Fix order to be alphabetical 2023-09-05 11:10:36 -06:00
cfe502d2d3 Add Packaging 23.1 to requirements.txt 2023-09-05 10:56:52 -06:00
23ff88e013 🖤 Format 2023-09-04 21:59:24 -06:00
84cafe664e Make files hover cursor pointer 2023-09-04 23:38:09 -04:00
4f7b2aaa95 Add contrast to number 2023-09-04 23:20:49 -04:00
1901bdbecb Reversion release meta and docs tags 2023-09-05 03:54:13 +01:00
751beaa7eb Replace all instances of bleach with nh3.
Using latest version of nh3.
2023-09-04 20:44:44 -06:00
44653f1a67 Merge branch 'feature/arcadia-notifications' into 'dev'
Add Arcadia Notifications to Front end

See merge request crafty-controller/crafty-4!621
2023-09-05 01:44:53 +00:00
2c14a3fd2c Appease the linter 2023-09-04 21:39:40 -04:00
2582563821 Update changelog !621 2023-09-05 02:25:24 +01:00
514bf8453f Appease sonar 2023-09-04 21:21:59 -04:00
9b7d0d83b5 Appease sonar 2023-09-04 21:14:03 -04:00
6158ea85b5 Appease sonar 2023-09-04 20:49:55 -04:00
a8af1bcdf0 Adjust front end styling 2023-09-04 20:42:50 -04:00
3c5560d3e2 Merge branch 'dev' into feature/arcadia-notifications 2023-09-04 20:38:33 -04:00
89f6b14d50 Merge branch 'refactor/remote-comms-patch-2' into 'dev'
Refactor/remote comms patch 2

See merge request crafty-controller/crafty-4!585
2023-09-05 00:34:16 +00:00
4051d98f8f Appease the linter 2023-09-04 20:28:55 -04:00
b34ecf58c2 Update changelog !585 2023-09-05 01:19:22 +01:00
e543389ead Merge branch 'dev' into refactor/remote-comms-patch-2 2023-09-05 01:13:50 +01:00
cdba8c5c69 Appease sonar security 2023-09-04 20:10:00 -04:00
c1d0902ea5 Appease sonar 2023-09-04 20:05:25 -04:00
350e02718e Merge branch 'bugfix/bump-crypto-267-268' into 'dev'
Bump crypto to resolve #267 & #268

See merge request crafty-controller/crafty-4!622
2023-09-04 23:57:26 +00:00
c2b3c98e39 Update changelog !622 2023-09-05 00:52:24 +01:00
9132928846 Merge branch 'dev' into bugfix/bump-crypto-267-268 2023-09-05 00:51:11 +01:00
2d26a40cb2 Merge branch 'bugfix/bump-tornado-269' into 'dev'
Bump tornado to resolve #269

See merge request crafty-controller/crafty-4!623
2023-09-04 23:50:07 +00:00
3467c1ccd6 Appease sonar 2023-09-04 19:48:03 -04:00
097421b34f Appease sonar 2023-09-04 19:45:39 -04:00
8664876c1b Update changelog !623 2023-09-05 00:43:52 +01:00
8e1e7f8e11 Appease sonar 2023-09-04 19:43:15 -04:00
46d7c3eb3c appease sonar 2023-09-04 19:41:59 -04:00
90dd1c79b8 Merge branch 'dev' into bugfix/bump-tornado-269 2023-09-05 00:40:35 +01:00
7134eb2eb8 Appease sonar 2023-09-04 19:40:27 -04:00
84a24687d0 Appease the linter 2023-09-04 19:38:20 -04:00
d3df67ba75 Appease Sonar 2023-09-04 19:35:48 -04:00
9c9f9d3556 Fix file get naming 2023-09-04 19:32:56 -04:00
88dada0b91 Reversion release 4.2.0 2023-09-05 00:30:11 +01:00
6ea46277bb Revert changelog !616 2023-09-05 00:22:49 +01:00
fe5e7e8851 Appease sonar 2023-09-04 19:22:32 -04:00
9d26a8ff8d Make sonar changes 2023-09-04 19:22:11 -04:00
cf92cd276a Merge branch 'revert-2a19e24a' into 'dev'
Revert "Merge branch 'refractor/remove-bleach' into 'dev'"

See merge request crafty-controller/crafty-4!625
2023-09-04 23:19:09 +00:00
81d6357596 Revert "Merge branch 'refractor/remove-bleach' into 'dev'"
This reverts merge request !616
2023-09-04 23:13:13 +00:00