Skip to content

Commit 676d65a

Browse files
Merge pull request #3238 from xibosignage/develop
Release 4.4.0
2 parents 1bc15f8 + 6333f10 commit 676d65a

File tree

199 files changed

+10381
-7875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+10381
-7875
lines changed

.github/workflows/test-suite.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ jobs:
6767

6868
- name: Pull
6969
run: |
70-
docker pull mysql:8
70+
docker pull mysql:8.4
7171
docker pull ghcr.io/xibosignage/xibo-xmr:latest
7272
docker pull ghcr.io/xibosignage/xibo-cms:test-${{ github.event.issue.number }}
7373
7474
- name: Run
7575
run: |
76-
docker run --name cms-db -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=cms -e MYSQL_USER=cms -e MYSQL_PASSWORD=jenkins -d mysql:8
76+
docker run --name cms-db -e MYSQL_RANDOM_ROOT_PASSWORD=yes -e MYSQL_DATABASE=cms -e MYSQL_USER=cms -e MYSQL_PASSWORD=jenkins -d mysql:8.4
7777
docker run --name cms-xmr -d ghcr.io/xibosignage/xibo-xmr:latest
7878
docker run --name cms-web -e MYSQL_HOST=cms-db -e MYSQL_USER=cms -e MYSQL_PASSWORD=jenkins -e CMS_DEV_MODE=true -e XMR_HOST=cms-xmr -e CMS_USAGE_REPORT=false -e INSTALL_TYPE=ci -e MYSQL_BACKUP_ENABLED=false --link cms-db --link cms-xmr -d ghcr.io/xibosignage/xibo-cms:test-${{ github.event.issue.number }}
7979

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ digital signage network, or single screen, open source and free to use.
1616

1717
[![Licence](https://img.shields.io/github/license/xibosignage/xibo-cms)]()
1818

19-
Copyright (C) 2006-2025 Xibo Signage Ltd and Contributors.
19+
Copyright (C) 2006-2026 Xibo Signage Ltd and Contributors.
2020

2121
Xibo is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public
2222
License as published by the Free Software Foundation, either version 3 of the License, or any later version.
@@ -72,7 +72,8 @@ git clone git@github.com:<your_id>/xibo-cms.git xibo-cms
7272
We maintain the following branches. To contribute to Xibo please use the `develop` branch as your base.
7373

7474
- develop: Bug fixes for 4.4.x
75-
- master: Currently 4.3
75+
- master: Currently 4.4
76+
- release43: Bug fixes for 4.3
7677
- release42: Bug fixes for 4.2
7778
- release33: Bug fixes for 3.3
7879
- release23: Archive of 2.3

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
"ext-simplexml": "*",
5757
"ext-zip": "*",
5858
"akrabat/ip-address-middleware" : "2.6.*",
59-
"apereo/phpcas": "1.6.*",
59+
"apereo/phpcas": "dev-master#6ef19a1e636303bda2f05f46b08035d53a8b602d",
6060
"dragonmantank/cron-expression": "^3.4",
61-
"erusev/parsedown": "~1.5",
61+
"erusev/parsedown": "dev-master#26cfde9dbffa43a77bfd45c87b0394df0dfcba85",
6262
"flynsarmy/slim-monolog": "~1.0",
6363
"gettext/gettext": "~4.0",
6464
"guzzlehttp/guzzle": "7.9.*",
@@ -78,7 +78,7 @@
7878
"mpdf/mpdf": "v8.1.*",
7979
"nesbot/carbon": "^2.73.0",
8080
"nyholm/psr7": "^1.8",
81-
"onelogin/php-saml": "4.1.*",
81+
"onelogin/php-saml": "4.3.*",
8282
"phenx/php-font-lib": "^0.5.0",
8383
"php-di/php-di": "7.0.*",
8484
"php-di/slim-bridge": "3.4.*",

composer.lock

Lines changed: 46 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
/*
2+
* Copyright (C) 2025 Xibo Signage Ltd
3+
*
4+
* Xibo - Digital Signage - https://xibosignage.com
5+
*
6+
* This file is part of Xibo.
7+
*
8+
* Xibo is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU Affero General Public License as published by
10+
* the Free Software Foundation, either version 3 of the License, or
11+
* any later version.
12+
*
13+
* Xibo is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU Affero General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU Affero General Public License
19+
* along with Xibo. If not, see <http://www.gnu.org/licenses/>.
20+
*/
21+
22+
23+
describe('Test IA: Toggle Mode ON/OFF', () => {
24+
25+
beforeEach(() => {
26+
cy.login();
27+
28+
// Navigate to Layouts page
29+
cy.visit('/layout/view');
30+
31+
//Click the Add Layout button
32+
cy.get('button.layout-add-button').click();
33+
cy.get('#layout-viewer').should('be.visible');
34+
});
35+
36+
it('should verify default status = OFF and checks the status of IA Mode when toggled to ON or OFF', () => {
37+
38+
//check default IA Mode = OFF
39+
cy.get('li.nav-item.interactive-control')
40+
.should('have.attr', 'data-status', 'off')
41+
.then(($el) => {
42+
cy.wrap($el).click({ force: true })
43+
})
44+
45+
//Toggle Mode = ON
46+
cy.get('li.nav-item.interactive-control')
47+
.should('have.attr', 'data-status', 'on')
48+
.and('contain.text', 'ON')
49+
50+
//Toggle OFF back to Layout Editor
51+
cy.get('li.nav-item.interactive-control').click({ force: true })
52+
cy.get('li.nav-item.interactive-control')
53+
.should('have.attr', 'data-status', 'off')
54+
.and('contain.text', 'OFF')
55+
});
56+
});

0 commit comments

Comments
 (0)