Commit Graph

2490 Commits

Author SHA1 Message Date
Andrew
eaa68751b2 Fix type error on interval check. 2022-09-25 11:17:44 -04:00
Zedifus
8cada1c450 Prepare 4.0.15 release base 2022-09-23 03:36:15 +01:00
Iain Powrie
47a06d2706 Merge branch 'dev' into 'master'
v4.0.14

See merge request crafty-controller/crafty-4!468
2022-09-23 02:26:32 +00:00
Iain Powrie
372d8fff37 Merge branch 'bug/websocket-set-subscription' into 'dev'
self.clients was already a set. cannot subscript

See merge request crafty-controller/crafty-4!467
2022-09-23 02:20:01 +00:00
Zedifus
9582eca869 Update changelog !467 2022-09-23 03:18:24 +01:00
Andrew
e2c846205b self.clients was already a set. cannot subscript 2022-09-22 21:42:58 -04:00
Zedifus
ff78e711d0 Prepare 4.0.14 release base 2022-09-20 23:50:07 +01:00
Iain Powrie
8dbda09f06 Merge branch 'dev' into 'master'
v4.0.13

See merge request crafty-controller/crafty-4!464
2022-09-20 22:41:15 +00:00
Zedifus
68561515f3 Correct release date 2022-09-20 23:24:00 +01:00
Zedifus
3209f69d14 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-20 23:22:00 +01:00
Zedifus
03a54d0249 Override 'unsubscriptable-object' pylint rule
False positive from 'self' use
2022-09-20 23:21:57 +01:00
Iain Powrie
251e676fec Merge branch 'bug/dev-schedules-users' into 'dev'
Fix cron edit traceback.

See merge request crafty-controller/crafty-4!466
2022-09-20 22:13:08 +00:00
Zedifus
ef87920114 Update changelog !465 !466 2022-09-20 23:10:39 +01:00
amcmanu3
ff8ddb0f6e Fix cron edit traceback.
Do not allow day to be greater than 30
2022-09-20 17:52:11 -04:00
amcmanu3
ca2358ac0a Fix user creation traceback 2022-09-20 17:43:54 -04:00
Iain Powrie
476025a370 Merge branch 'bug/gravatar-logical' into 'dev'
Gravatar/Terminal Tweaks for v4.0.13

See merge request crafty-controller/crafty-4!465
2022-09-20 01:01:24 +00:00
amcmanu3
084cb8b71c Fix scrollable term issue on startup 2022-09-19 20:17:02 -04:00
amcmanu3
63347f956b Fix logical issues surrounding Gravatar fetch 2022-09-19 20:00:15 -04:00
Zedifus
0829331534 Appease Minor and Major lint issues in !464 2022-09-19 23:49:16 +01:00
Zedifus
0e1237c0f4 Fix CQ Reports
Strip out badge creation for now until it can fit with pipelines
2022-09-19 23:31:01 +01:00
Zedifus
88eebac6fe Update changelog v4.0.13 2022-09-19 23:10:29 +01:00
Iain Powrie
f343c01cb6 Merge branch 'bug/start-nonetype' into 'dev'
Check to "which java" doesn't return none

See merge request crafty-controller/crafty-4!463
2022-09-19 22:04:19 +00:00
Zedifus
65875dbd9a Update changelog !463 2022-09-19 23:00:36 +01:00
Zedifus
532409a08d Merge branch 'dev' into bug/start-nonetype 2022-09-19 22:57:42 +01:00
Iain Powrie
44abbef9c7 Merge branch 'tweak/reaction-schedules' into 'dev'
Make default option be selected option in edit

See merge request crafty-controller/crafty-4!462
2022-09-19 21:55:58 +00:00
Zedifus
77bc7d5019 Update changelog !462 2022-09-19 22:51:26 +01:00
Zedifus
2b36fbd448 Merge branch 'dev' into tweak/reaction-schedules 2022-09-19 22:50:55 +01:00
Iain Powrie
e61d358498 Merge branch 'bug/websocket-client-list-size' into 'dev'
Handle client list size changing on websocket send

See merge request crafty-controller/crafty-4!461
2022-09-19 21:44:11 +00:00
Zedifus
f9818f33da Update changelog !461 2022-09-19 22:42:11 +01:00
Zedifus
48b3c26f42 Merge branch 'dev' into bug/websocket-client-list-size 2022-09-19 22:40:23 +01:00
Iain Powrie
5a492ddd1b Merge branch 'bug/unloaded-server-config' into 'dev'
Fix typo in panel handler for  unloaded config

See merge request crafty-controller/crafty-4!460
2022-09-19 21:37:37 +00:00
Zedifus
bce7c6aa4f Update changelog !460 2022-09-19 22:34:07 +01:00
Zedifus
d3cfdd4a78 Merge branch 'dev' into bug/unloaded-server-config 2022-09-19 22:33:30 +01:00
Iain Powrie
4a07c0a74d Merge branch 'bug/gravatar-fetch' into 'dev'
Don't query gravatar everytime a page is loaded

See merge request crafty-controller/crafty-4!459
2022-09-19 21:24:49 +00:00
Zedifus
be57731742 Update changelog !459 2022-09-19 22:20:00 +01:00
Zedifus
518eb6af23 Merge branch 'dev' into bug/gravatar-fetch 2022-09-19 22:18:11 +01:00
Iain Powrie
c53a873432 Merge branch 'tweak/backup-restore' into 'dev'
Add schedules to backup restore

See merge request crafty-controller/crafty-4!458
2022-09-19 21:15:01 +00:00
Zedifus
bc1993b305 Update changelog !458 2022-09-19 22:12:48 +01:00
Zedifus
d2d812edb7 Merge branch 'dev' into tweak/backup-restore 2022-09-19 22:11:53 +01:00
Iain Powrie
cb50bb288f Merge branch 'bug/bleach' into 'dev'
Temporary bandaid for &

See merge request crafty-controller/crafty-4!457
2022-09-19 21:09:31 +00:00
Zedifus
ad8d85ef59 Update changelog !457 2022-09-19 22:07:31 +01:00
Zedifus
be8b24975d Merge branch 'dev' into bug/bleach 2022-09-19 22:04:59 +01:00
Iain Powrie
4b21270fa7 Merge branch 'bug/js-errors' into 'dev'
Cleanup JS errors

See merge request crafty-controller/crafty-4!455
2022-09-19 21:01:50 +00:00
Zedifus
c6dfd9688d Update changelog !455 2022-09-19 21:58:41 +01:00
Zedifus
07941b7c3c Merge branch 'dev' into bug/js-errors 2022-09-19 21:57:43 +01:00
Iain Powrie
67d853700a Merge branch 'tweak/terminal-scroll' into 'dev'
Add button to scroll to bottom of vterm

See merge request crafty-controller/crafty-4!454
2022-09-19 20:53:54 +00:00
Zedifus
e6351dab75 Update changelog !454 2022-09-19 21:49:50 +01:00
Zedifus
53be81dc08 Merge branch 'dev' into tweak/terminal-scroll 2022-09-19 21:47:52 +01:00
Iain Powrie
6ad0bf2daa Merge branch 'tweak/debug-backup-logging' into 'dev'
Change how we calc backup exclusions list range

See merge request crafty-controller/crafty-4!453
2022-09-19 20:45:40 +00:00
Zedifus
8ce36b5cc8 Update changelog !453 2022-09-19 21:42:48 +01:00