Merge branch 'develop'

MyEMS · Feb 17, 2024 · a291da6 · a291da6
2 parents 8316bb5 + 0bfef6a
commit a291da6
Show file tree

Hide file tree

Showing 13 changed files with 190 additions and 136 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Added
+### Changed
+### Fixed
+### Removed
+
+## [v4.2.0] - 2024-02-18
+
 ### Added
 - None
 ### Changed
@@ -16,10 +23,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - updated shopfloor export, import and clone functions in myems-api
 - updated store export, import and clone functions in myems-api
 - updated tenant export, import and clone functions in myems-api
-- 
-### Fixed
 - updated run action of rule in myems-api
 - updated run action of advanced report in myems-api
+### Fixed
 - fixed warnings in myems-web
 - fixed issue of CardSummary in myems-web
 - fixed issue of demo data in database
@@ -1602,7 +1608,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 -   None.
 
-[Unreleased]: https://github.com/MyEMS/myems/compare/v4.1.0...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v4.2.0...HEAD
+[4.2.0]: https://github.com/MyEMS/myems/compare/v4.2.0...v4.1.0
 [4.1.0]: https://github.com/MyEMS/myems/compare/v4.1.0...v4.0.0
 [4.0.0]: https://github.com/MyEMS/myems/compare/v4.0.0...v3.12.0
 [3.12.0]: https://github.com/MyEMS/myems/compare/v3.12.0...v3.11.0

diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql
@@ -1899,7 +1899,7 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '4.1.0', '2024-02-08');
+(1, '4.2.0', '2024-02-18');
 
 COMMIT;
 

diff --git a/database/upgrade/upgrade4.2.0RC.sql → database/upgrade/upgrade4.2.0.sql b/database/upgrade/upgrade4.2.0RC.sql → database/upgrade/upgrade4.2.0.sql
@@ -7,6 +7,6 @@
 START TRANSACTION;
 
 -- UPDATE VERSION NUMBER
-UPDATE `myems_system_db`.`tbl_versions` SET version='4.2.0RC', release_date='2024-03-01' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='4.2.0', release_date='2024-02-18' WHERE id=1;
 
 COMMIT;
diff --git a/myems-admin/views/common/footer-login.html b/myems-admin/views/common/footer-login.html
@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v4.1.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v4.2.0 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>
diff --git a/myems-admin/views/common/footer.html b/myems-admin/views/common/footer.html
@@ -3,6 +3,6 @@
         <strong><a href="https://myems.io">https://myems.io</a></strong>
     </div>
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v4.1.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v4.2.0</strong>
     </div>
 </div>
diff --git a/myems-aggregation/version.txt b/myems-aggregation/version.txt
@@ -1 +1 @@
-4.1.0
+4.2.0
diff --git a/myems-api/core/version.py b/myems-api/core/version.py
@@ -14,8 +14,8 @@ def on_options(req, resp, id_):
 
     @staticmethod
     def on_get(req, resp):
-        result = {"version": 'MyEMS v4.1.0',
-                  "release-date": '2024-02-08',
+        result = {"version": 'MyEMS v4.2.0',
+                  "release-date": '2024-02-18',
                   "licensed-to": 'COMMUNITY',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)

diff --git a/myems-cleaning/version.txt b/myems-cleaning/version.txt
@@ -1 +1 @@
-4.1.0
+4.2.0
diff --git a/myems-modbus-tcp/version.txt b/myems-modbus-tcp/version.txt
@@ -1 +1 @@
-4.1.0
+4.2.0
diff --git a/myems-normalization/version.txt b/myems-normalization/version.txt
@@ -1 +1 @@
-4.1.0
+4.2.0