From f1cd53e6505757c229f2de68bae88ca388d871cb Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Sat, 4 Sep 2021 12:43:58 +0800
Subject: [PATCH] upgraded version number to v1.2.3
---
CHANGELOG.md | 47 +++++++++++++++++++---------
admin/views/common/footer-login.html | 2 +-
admin/views/common/footer.html | 2 +-
database/myems_system_db.sql | 2 +-
web/package-lock.json | 4 +--
web/package.json | 2 +-
web/src/config.js | 2 +-
7 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e13b5bc..afa87e06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
- None.
+## [v1.2.3] - 2021-09-04
+### Added
+- added tbl_reports to myems_reporting_db in database.
+- added trusted-host to Dockerfiles
+
+### Changed
+- updated README.
+- renamed language cn to zh-cn in Admin UI
+
+### Fixed
+- fixed Local Storage conflicts in Admin UI and Web UI .
+- fixed issues in database demo script
+
+### Removed
+- None.
+
## [v1.2.2] - 2021-08-28
### Added
- added user log to UserLogin, ChangePassword and ResetPassword in API
@@ -407,19 +423,20 @@ 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.2.2...HEAD
-[v1.2.2]: https://github.com/MyEMS/myems/compare/v1.2.1...v1.2.2
-[v1.2.1]: https://github.com/MyEMS/myems/compare/v1.2.0...v1.2.1
-[v1.2.0]: https://github.com/MyEMS/myems/compare/v1.1.6...v1.2.0
-[v1.1.6]: https://github.com/MyEMS/myems/compare/v1.1.5...v1.1.6
-[v1.1.5]: https://github.com/MyEMS/myems/compare/v1.1.4...v1.1.5
-[v1.1.4]: https://github.com/MyEMS/myems/compare/v1.1.3...v1.1.4
-[v1.1.3]: https://github.com/MyEMS/myems/compare/v1.1.2...v1.1.3
-[v1.1.2]: https://github.com/MyEMS/myems/compare/v1.1.1...v1.1.2
-[v1.1.1]: https://github.com/MyEMS/myems/compare/v1.1.0...v1.1.1
-[v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.8...v1.1.0
-[v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.7...v1.0.8
-[v1.0.7]: https://github.com/MyEMS/myems/compare/v1.0.6...v1.0.7
-[v1.0.6]: https://github.com/MyEMS/myems/compare/v1.0.5...v1.0.6
-[v1.0.5]: https://github.com/MyEMS/myems/releases/tag/v1.0.5
+[Unreleased]: https://github.com/MyEMS/MyEMS/compare/v1.2.3...HEAD
+[v1.2.3]: https://github.com/MyEMS/MyEMS/compare/v1.2.2...v1.2.3
+[v1.2.2]: https://github.com/MyEMS/MyEMS/compare/v1.2.1...v1.2.2
+[v1.2.1]: https://github.com/MyEMS/MyEMS/compare/v1.2.0...v1.2.1
+[v1.2.0]: https://github.com/MyEMS/MyEMS/compare/v1.1.6...v1.2.0
+[v1.1.6]: https://github.com/MyEMS/MyEMS/compare/v1.1.5...v1.1.6
+[v1.1.5]: https://github.com/MyEMS/MyEMS/compare/v1.1.4...v1.1.5
+[v1.1.4]: https://github.com/MyEMS/MyEMS/compare/v1.1.3...v1.1.4
+[v1.1.3]: https://github.com/MyEMS/MyEMS/compare/v1.1.2...v1.1.3
+[v1.1.2]: https://github.com/MyEMS/MyEMS/compare/v1.1.1...v1.1.2
+[v1.1.1]: https://github.com/MyEMS/MyEMS/compare/v1.1.0...v1.1.1
+[v1.0.8]: https://github.com/MyEMS/MyEMS/compare/v1.0.8...v1.1.0
+[v1.0.8]: https://github.com/MyEMS/MyEMS/compare/v1.0.7...v1.0.8
+[v1.0.7]: https://github.com/MyEMS/MyEMS/compare/v1.0.6...v1.0.7
+[v1.0.6]: https://github.com/MyEMS/MyEMS/compare/v1.0.5...v1.0.6
+[v1.0.5]: https://github.com/MyEMS/MyEMS/releases/tag/v1.0.5
diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html
index f71b157c..1560f91a 100644
--- a/admin/views/common/footer-login.html
+++ b/admin/views/common/footer-login.html
@@ -1,5 +1,5 @@
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html
index 624aa98e..74993997 100644
--- a/admin/views/common/footer.html
+++ b/admin/views/common/footer.html
@@ -3,6 +3,6 @@
https://myems.io
- {{'MY_EMS_NAME' | translate}} v1.2.2
+ {{'MY_EMS_NAME' | translate}} v1.2.3
diff --git a/database/myems_system_db.sql b/database/myems_system_db.sql
index 3d54cd70..5182ae94 100644
--- a/database/myems_system_db.sql
+++ b/database/myems_system_db.sql
@@ -1243,6 +1243,6 @@ USE `myems_system_db`;
INSERT INTO `myems_system_db`.`tbl_versions`
(`id`, `version`, `release_date`)
VALUES
-(1, '1.2.2', '2021-08-28');
+(1, '1.2.3', '2021-09-04');
COMMIT;
diff --git a/web/package-lock.json b/web/package-lock.json
index c8cb36af..3952689e 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "myems",
- "version": "1.2.2",
+ "version": "1.2.3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "myems",
- "version": "1.2.2",
+ "version": "1.2.3",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
"@fortawesome/fontawesome-svg-core": "^1.2.30",
diff --git a/web/package.json b/web/package.json
index 9bb7c048..59399009 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
{
"name": "myems",
- "version": "1.2.2",
+ "version": "1.2.3",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
diff --git a/web/src/config.js b/web/src/config.js
index ab88fad3..d31aeab5 100644
--- a/web/src/config.js
+++ b/web/src/config.js
@@ -1,4 +1,4 @@
-export const version = '1.2.2';
+export const version = '1.2.3';
export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
export const topNavbarBreakpoint = 'lg';
//export const APIBaseURL = 'http://127.0.0.1:8000';