updated version number to 3.6.0

CHANGELOG.md

@@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
+- 
+### Changed
+- 
+### Fixed
+- 
+### Removed
+- 
+
+## [v3.6.0] - 2023-06-22
+### Added
 - added microgrid battery actions to myems-api and myems-admin
 - added microgrid evcharger actions to myems-api and myems-admin
 - added microgrid generator actions to myems-api and myems-admin
@@ -21,16 +31,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - added API Key to database, myems-api and myems-admin
 - added access control to shopfloor in myems-api, myems-admin and myems-web
 - added access control to store in myems-api, myems-admin and myems-web
-- 
+
 ### Changed
 - renamed access_control to admin_control in myems-api
 - changed forgot password and user register processes
-- 
+
 ### Fixed
 - fixed dialog doesn't close after myems-admin logging out automatically
 - fixed warning of dependencies in myems-web
 
 ### Removed
+- None
 
 ## [v3.5.0] - 2023-06-09
 ### Added
@@ -1334,7 +1345,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/v3.5.0...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v3.6.0...HEAD
+[3.6.0]: https://github.com/MyEMS/myems/compare/v3.6.0...v3.5.0
 [3.5.0]: https://github.com/MyEMS/myems/compare/v3.5.0...v3.4.0
 [3.4.0]: https://github.com/MyEMS/myems/compare/v3.4.0...v3.3.0
 [3.3.0]: https://github.com/MyEMS/myems/compare/v3.3.0...v3.2.0

database/install/myems_system_db.sql

@@ -1646,7 +1646,7 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '3.6.0RC', '2023-06-18');
+(1, '3.6.0', '2023-06-22');
 
 COMMIT;
 

database/upgrade/upgrade3.6.0RC.sql → database/upgrade/upgrade3.6.0.sql

@@ -63,6 +63,6 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_api_keys`  (
 CREATE INDEX `tbl_api_keys_index_1` ON `myems_user_db`.`tbl_api_keys` (`created_datetime_utc`, `name`);
 
 -- UPDATE VERSION NUMBER
-UPDATE `myems_system_db`.`tbl_versions` SET version='3.6.0RC', release_date='2023-06-18' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='3.6.0', release_date='2023-06-22' WHERE id=1;
 
 COMMIT;
\ No newline at end of file

myems-admin/views/common/footer-login.html

 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v3.5.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v3.6.0 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>

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}} v3.5.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v3.6.0</strong>
     </div>
 </div>

myems-aggregation/version.txt

-3.5.0
\ No newline at end of file
+3.6.0
\ No newline at end of file

myems-api/core/version.py

@@ -15,8 +15,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS v3.5.0',
-                  "release-date": '2023-06-09',
+        result = {"version": 'MyEMS v3.6.0',
+                  "release-date": '2023-06-22',
                   "licensed-to": 'COMMUNITY',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)

myems-modbus-tcp/version.txt

-3.5.0
\ No newline at end of file
+3.6.0
\ No newline at end of file

myems-normalization/version.txt

-3.5.0
\ No newline at end of file
+3.6.0
\ No newline at end of file

myems-web/package.json

 {
   "name": "myems",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",

myems-web/src/config.js

-export const version = '3.5.0';
+export const version = '3.6.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';