Clear down develop ahead of v4 release. (#2031)

* Bump league/oauth2-server from 8.3.5 to 8.4.2 (#1960)

Bumps [league/oauth2-server](https://github.com/thephpleague/oauth2-server) from 8.3.5 to 8.4.2.
- [Release notes](https://github.com/thephpleague/oauth2-server/releases)
- [Changelog](https://github.com/thephpleague/oauth2-server/blob/8.4.2/CHANGELOG.md)
- [Commits](thephpleague/oauth2-server@8.3.5...8.4.2)

---
updated-dependencies:
- dependency-name: league/oauth2-server
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* SAML support for OKTA (#1963)

relates to xibosignage/xibo#3082

* Bump tough-cookie, less and @cypress/request (#1961)

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) to 4.1.3 and updates ancestor dependencies [tough-cookie](https://github.com/salesforce/tough-cookie), [less](https://github.com/less/less.js) and [@cypress/request](https://github.com/cypress-io/request). These dependencies need to be updated together.


Updates `tough-cookie` from 2.4.3 to 4.1.3
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v2.4.3...v4.1.3)

Updates `less` from 3.11.1 to 3.13.1
- [Release notes](https://github.com/less/less.js/releases)
- [Changelog](https://github.com/less/less.js/blob/master/CHANGELOG.md)
- [Commits](less/less.js@v3.11.1...v3.13.1)

Updates `@cypress/request` from 2.88.10 to 2.88.12
- [Release notes](https://github.com/cypress-io/request/releases)
- [Changelog](https://github.com/cypress-io/request/blob/master/CHANGELOG.md)
- [Commits](cypress-io/request@v2.88.10...v2.88.12)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
- dependency-name: less
  dependency-type: direct:production
- dependency-name: "@cypress/request"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump semver from 5.5.0 to 5.7.2 (#1906)

Bumps [semver](https://github.com/npm/node-semver) from 5.5.0 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.5.0...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump word-wrap from 1.2.3 to 1.2.4 (#1921)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Interactive: make sure notifyByLayoutCode checks for scheduled actions. (#1989)

xibosignage/xibo#3086

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Peter <peter@xibosignage.com>

lib/Service/DisplayNotifyService.php

@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2022-2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -723,6 +723,34 @@ public function notifyByLayoutCode($code)
                   )
               )
             UNION
+            SELECT DISTINCT display.displayId,
+                schedule.eventId,
+                schedule.fromDt,
+                schedule.toDt,
+                schedule.recurrence_type AS recurrenceType,
+                schedule.recurrence_detail AS recurrenceDetail,
+                schedule.recurrence_range AS recurrenceRange,
+                schedule.recurrenceRepeatsOn,
+                schedule.lastRecurrenceWatermark,
+                schedule.dayPartId
+            FROM `schedule`
+                     INNER JOIN `lkscheduledisplaygroup`
+                        ON `lkscheduledisplaygroup`.eventId = `schedule`.eventId
+                     INNER JOIN `lkdgdg`
+                        ON `lkdgdg`.parentId = `lkscheduledisplaygroup`.displayGroupId
+                     INNER JOIN `lkdisplaydg`
+                        ON lkdisplaydg.DisplayGroupID = `lkdgdg`.childId
+                     INNER JOIN `display`
+                        ON lkdisplaydg.DisplayID = display.displayID
+            WHERE schedule.actionLayoutCode = :code 
+              AND (
+                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, `schedule`.fromDt) > :fromDt)
+                  OR `schedule`.recurrence_range >= :fromDt 
+                  OR (
+                    IFNULL(`schedule`.recurrence_range, 0) = 0 AND IFNULL(`schedule`.recurrence_type, \'\') <> \'\'
+                  )
+              ) 
+            UNION
             SELECT DISTINCT display.DisplayID,
                 0 AS eventId, 
                 0 AS fromDt,