Merge branch 'develop'

CHANGELOG.md

@@ -5,12 +5,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
+- None.
+
+### Changed
+- None.
+
+### Fixed
+- None.
+
+### Removed
+- None.
+
+## [v1.9.0] -   2022-04-16
+### Added
 - added myems_production_db to database.
 - added column to `myems_production_db`.`tbl_teams` in database.
 - added instruction for running myems-api with waitress on Windows.
 - added nano to Dockfile.
 - added telnet to Dockerfile.
-- 
 
 ### Changed
 - renamed folder admin to myems-admin, and folder web to myems-web.
@@ -786,7 +798,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/v1.8.2...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.9.0...HEAD
+[v1.9.0]: https://github.com/MyEMS/myems/compare/v1.8.2...v1.9.0
 [v1.8.2]: https://github.com/MyEMS/myems/compare/v1.8.1...v1.8.2
 [v1.8.1]: https://github.com/MyEMS/myems/compare/v1.8.0...v1.8.1
 [v1.8.0]: https://github.com/MyEMS/myems/compare/v1.7.2...v1.8.0

database/install/myems_system_db.sql

@@ -1248,6 +1248,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.9.0', '2022-03-28');
+(1, '1.9.0', '2022-04-16');
 
 COMMIT;

database/upgrade/upgrade1.9.0.sql

@@ -72,6 +72,6 @@ CREATE INDEX `tbl_teams_index_1` ON  `myems_production_db`.`tbl_teams`   (`name`
 
 -- UPDATE VERSION NUMBER
 USE `myems_system_db` ;
-UPDATE `myems_system_db`.`tbl_versions` SET version='1.9.0', release_date='2022-03-28' WHERE id=1;
+UPDATE `myems_system_db`.`tbl_versions` SET version='1.9.0', release_date='2022-04-16' WHERE id=1;
 
 COMMIT;

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

@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.8.2 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.9.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}} v1.8.2</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.9.0</strong>
     </div>
 </div>

myems-api/core/version.py

@@ -15,8 +15,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS v1.8.2',
+        result = {"version": 'MyEMS v1.9.0',
-                  "release-date": '2022-03-16',
+                  "release-date": '2022-04-16',
                   "website": "https://myems.io"}
         resp.text = json.dumps(result)
 

myems-web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",

myems-web/src/config.js

@@ -1,4 +1,4 @@
-export const version = '1.8.2';
+export const version = '1.9.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';