Skip to content

Commit e70fe7a

Browse files
clivewalkdenclivewalkden
committed
Merge branch 'release/v400.0.0' into 2.4
2 parents ac91441 + a4914fd commit e70fe7a

File tree

13 files changed

+127
-123
lines changed

13 files changed

+127
-123
lines changed

‎Block/System/Config/Form/Fieldset/Details.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
2-
/**
3-
* SOZO Design Ltd
2+
/*
3+
* SOZO Design Ltd
44
*
5-
* NOTICE OF LICENSE
5+
* NOTICE OF LICENSE
66
*
7-
* This source file is subject to the SOZO Proprietary EULA
8-
* that is bundled with this package in the file LICENSE.
9-
* It is also available through the world-wide-web at this URL:
10-
* http://opensource.org/licenses/osl-3.0.php
7+
* This source file is subject to the SOZO Proprietary EULA
8+
* that is bundled with this package in the file LICENSE.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
1111
*
12-
* @category SOZO Design Ltd
13-
* @package Sozo_ZendeskChat
14-
* @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
12+
* @category SOZO Design Ltd
13+
* @package Sozo_ZendeskChat
14+
* @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1616
*/
1717

1818
namespace Sozo\ZendeskChat\Block\System\Config\Form\Fieldset;

‎Block/Widget.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
2-
/**
3-
* SOZO Design Ltd
2+
/*
3+
* SOZO Design Ltd
44
*
5-
* NOTICE OF LICENSE
5+
* NOTICE OF LICENSE
66
*
7-
* This source file is subject to the SOZO Proprietary EULA
8-
* that is bundled with this package in the file LICENSE.
9-
* It is also available through the world-wide-web at this URL:
10-
* http://opensource.org/licenses/osl-3.0.php
7+
* This source file is subject to the SOZO Proprietary EULA
8+
* that is bundled with this package in the file LICENSE.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
1111
*
12-
* @category SOZO Design Ltd
13-
* @package Sozo_ZendeskChat
14-
* @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
12+
* @category SOZO Design Ltd
13+
* @package Sozo_ZendeskChat
14+
* @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1616
*/
1717

1818
namespace Sozo\ZendeskChat\Block;

‎CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ Given a version number MAJOR.MINOR.PATCH, increment the:
2121

2222
### [Unreleased]
2323

24-
### [v300.0.1] - 2020-05-27
24+
## [v400.0.0] - 2022-05-09
25+
### Added
26+
- Magento 2.4 compatibility
27+
28+
### Changed
29+
- Removed year from copyright
30+
31+
32+
## [v300.0.1] - 2020-05-27
2533
- Initial Release
2634

‎Helper/Data.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
2-
/**
3-
* SOZO Design Ltd
2+
/*
3+
* SOZO Design Ltd
44
*
5-
* NOTICE OF LICENSE
5+
* NOTICE OF LICENSE
66
*
7-
* This source file is subject to the SOZO Proprietary EULA
8-
* that is bundled with this package in the file LICENSE.
9-
* It is also available through the world-wide-web at this URL:
10-
* http://opensource.org/licenses/osl-3.0.php
7+
* This source file is subject to the SOZO Proprietary EULA
8+
* that is bundled with this package in the file LICENSE.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
1111
*
12-
* @category SOZO Design Ltd
13-
* @package Sozo_ZendeskChat
14-
* @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
12+
* @category SOZO Design Ltd
13+
* @package Sozo_ZendeskChat
14+
* @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1616
*/
1717

1818
namespace Sozo\ZendeskChat\Helper;

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
],
1616
"require": {
17-
"magento/framework": "102.0.*"
17+
"magento/magento-composer-installer": "*"
1818
},
1919
"type": "magento2-module",
2020
"license": "OSL-3.0",

‎etc/acl.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ SOZO Design
3+
~ SOZO Design Ltd
44
~
5-
~ NOTICE OF LICENSE
5+
~ NOTICE OF LICENSE
66
~
7-
~ This source file is subject to the Open Software License (OSL 3.0)
8-
~ that is bundled with this package in the file LICENSE.
9-
~ It is also available through the world-wide-web at this URL:
10-
~ http://opensource.org/licenses/osl-3.0.php
11-
~
12-
~ @category SOZO Design
13-
~ @package Sozo_ZendeskChat
14-
~ @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
7+
~ This source file is subject to the SOZO Proprietary EULA
8+
~ that is bundled with this package in the file LICENSE.
9+
~ It is also available through the world-wide-web at this URL:
10+
~ http://opensource.org/licenses/osl-3.0.php
1611
~
12+
~ @category SOZO Design Ltd
13+
~ @package Sozo_ZendeskChat
14+
~ @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1716
-->
1817

1918
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">

‎etc/adminhtml/system.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ SOZO Design
3+
~ SOZO Design Ltd
44
~
5-
~ NOTICE OF LICENSE
5+
~ NOTICE OF LICENSE
66
~
7-
~ This source file is subject to the Open Software License (OSL 3.0)
8-
~ that is bundled with this package in the file LICENSE.
9-
~ It is also available through the world-wide-web at this URL:
10-
~ http://opensource.org/licenses/osl-3.0.php
11-
~
12-
~ @category SOZO Design
13-
~ @package Sozo_ZendeskChat
14-
~ @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
7+
~ This source file is subject to the SOZO Proprietary EULA
8+
~ that is bundled with this package in the file LICENSE.
9+
~ It is also available through the world-wide-web at this URL:
10+
~ http://opensource.org/licenses/osl-3.0.php
1611
~
12+
~ @category SOZO Design Ltd
13+
~ @package Sozo_ZendeskChat
14+
~ @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1716
-->
1817
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
1918
<system>

‎etc/config.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ SOZO Design
3+
~ SOZO Design Ltd
44
~
5-
~ NOTICE OF LICENSE
5+
~ NOTICE OF LICENSE
66
~
7-
~ This source file is subject to the Open Software License (OSL 3.0)
8-
~ that is bundled with this package in the file LICENSE.
9-
~ It is also available through the world-wide-web at this URL:
10-
~ http://opensource.org/licenses/osl-3.0.php
11-
~
12-
~ @category SOZO Design
13-
~ @package Sozo_ZendeskChat
14-
~ @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
7+
~ This source file is subject to the SOZO Proprietary EULA
8+
~ that is bundled with this package in the file LICENSE.
9+
~ It is also available through the world-wide-web at this URL:
10+
~ http://opensource.org/licenses/osl-3.0.php
1611
~
12+
~ @category SOZO Design Ltd
13+
~ @package Sozo_ZendeskChat
14+
~ @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1716
-->
1817
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
1918
<default>

‎etc/module.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ SOZO Design Ltd
3+
~ SOZO Design Ltd
44
~
5-
~ NOTICE OF LICENSE
5+
~ NOTICE OF LICENSE
66
~
7-
~ This source file is subject to the SOZO Proprietary EULA
8-
~ that is bundled with this package in the file LICENSE.
9-
~ It is also available through the world-wide-web at this URL:
10-
~ http://opensource.org/licenses/osl-3.0.php
7+
~ This source file is subject to the SOZO Proprietary EULA
8+
~ that is bundled with this package in the file LICENSE.
9+
~ It is also available through the world-wide-web at this URL:
10+
~ http://opensource.org/licenses/osl-3.0.php
1111
~
12-
~ @category SOZO Design Ltd
13-
~ @package Sozo_ZendeskChat
14-
~ @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
12+
~ @category SOZO Design Ltd
13+
~ @package Sozo_ZendeskChat
14+
~ @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1616
-->
1717
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
18-
<module name="Sozo_ZendeskChat" setup_version="300.0.1"/>
18+
<module name="Sozo_ZendeskChat" setup_version="400.0.0"/>
1919
</config>

‎registration.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
2-
/**
3-
* SOZO Design Ltd
2+
/*
3+
* SOZO Design Ltd
44
*
5-
* NOTICE OF LICENSE
5+
* NOTICE OF LICENSE
66
*
7-
* This source file is subject to the SOZO Proprietary EULA
8-
* that is bundled with this package in the file LICENSE.
9-
* It is also available through the world-wide-web at this URL:
10-
* http://opensource.org/licenses/osl-3.0.php
7+
* This source file is subject to the SOZO Proprietary EULA
8+
* that is bundled with this package in the file LICENSE.
9+
* It is also available through the world-wide-web at this URL:
10+
* http://opensource.org/licenses/osl-3.0.php
1111
*
12-
* @category SOZO Design Ltd
13-
* @package Sozo_ZendeskChat
14-
* @copyright Copyright (c) 2020 SOZO Design Ltd (https://sozodesign.co.uk)
15-
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
12+
* @category SOZO Design Ltd
13+
* @package Sozo_ZendeskChat
14+
* @copyright Copyright (c) SOZO Design Ltd (https://sozodesign.co.uk)
15+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
1616
*/
1717

1818
use \Magento\Framework\Component\ComponentRegistrar;

0 commit comments

Comments
 (0)