From ad2000c3fe8e50e2e8fc34c39145be64505c7980 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 19 Aug 2021 15:32:42 +0800 Subject: [PATCH] upgraded version numbers to 1.2.1 --- CHANGELOG.md | 47 +++++++++++++++++++++++++++- admin/views/common/footer-login.html | 2 +- admin/views/common/footer.html | 2 +- database/myems_system_db.sql | 2 +- database/upgrade/upgrade1.2.1.sql | 2 +- web/package-lock.json | 4 +-- web/package.json | 2 +- web/src/config.js | 2 +- 8 files changed, 54 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9f22dff..42a7b5f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,50 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. +## [v1.2.1] - 2021-08-19 +### Added +- Added Missing Error Messages Words of API to Web UI i18n +- Added rule_id to messages tables of fdd database +- added version tags to images in Dockerfile + +### Changed +- renamed virtualmeter.model.html in Admin UI +- replaced stateChangeStart with transitions.onStart in Admin UI +- added filters for jstree action types of menu and space in Admin UI +- updated README of Web UI +- replaced href with ng-href in Admin UI +- upgraded Highcharts JS to v9.1.2 +- upgraded jquery-ui to v1.12.1 +- updated Admin UI translations for Error Messages of API +- upgraded ocLazyLoad to v1.0.10 in Admin UI +- updated Dockerfiles to add pip mirrors +- upgraded AngularJS to v1.8.2 + +### Fixed +- removed unnecessary jc.jsextend library from Admin UI +- fixed debugging code issues in Admin UI +- fixed unused code issues in Admin UI +- fixed self assignment error in Web UI +- fixed 'Clear-text logging of sensitive information' in API +- fixed 'The variable binary_file_data does not seem to be defined for all execution paths' in API +- replaced == with === to avoid casting in Admin UI +- fixed response body of Restore actions +- fixed typos in database +- fixed typo in API +- fixed typo in demo data of database + +### Removed +- removed unused logs +- removed diff-match-patch library from Admin UI +- removed jeditable library from Admin UI +- removed js plugins codemirror and summernote from Admin UI +- removed 'unused import' from API +- removed uncessary pass from acquisition.py of myems-modbus-tcp +- removed unused import from meterbatch.py of API +- removed unnecessary library mathjax from Admin UI +- removed unnecessary libraries d3, and3, nvd3 and c3 from Admin UI +- removed unnecessary library nggrid from Admin UI + ## [v1.2.0] - 2021-08-08 ### Added - Added demo data to database @@ -337,7 +381,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.2.0...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.2.1...HEAD +[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 diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index a6833fdc..26b194d9 100644 --- a/admin/views/common/footer-login.html +++ b/admin/views/common/footer-login.html @@ -1,5 +1,5 @@
- {{'MY_EMS_NAME' | translate}} v1.2.0 https://myems.io + {{'MY_EMS_NAME' | translate}} v1.2.1 https://myems.io
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html index 8d3d37aa..02c4d66c 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.0 + {{'MY_EMS_NAME' | translate}} v1.2.1
diff --git a/database/myems_system_db.sql b/database/myems_system_db.sql index c8b79c1c..9244d43e 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.1', '2021-08-08'); +(1, '1.2.1', '2021-08-19'); COMMIT; diff --git a/database/upgrade/upgrade1.2.1.sql b/database/upgrade/upgrade1.2.1.sql index a4732f94..def33377 100644 --- a/database/upgrade/upgrade1.2.1.sql +++ b/database/upgrade/upgrade1.2.1.sql @@ -5,4 +5,4 @@ ALTER TABLE myems_fdd_db.tbl_wechat_messages_outbox ADD rule_id BIGINT NOT NULL -- UPDATE VERSION NUMBER -UPDATE myems_system_db.tbl_versions SET version='1.2.1', release_date='2021-08-08' WHERE id=1; +UPDATE myems_system_db.tbl_versions SET version='1.2.1', release_date='2021-08-19' WHERE id=1; diff --git a/web/package-lock.json b/web/package-lock.json index 1dfbb9de..81f061b2 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "myems", - "version": "1.2.0", + "version": "1.2.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "myems", - "version": "1.2.0", + "version": "1.2.1", "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 eb09d7fc..e703d6bc 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "myems", - "version": "1.2.0", + "version": "1.2.1", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", diff --git a/web/src/config.js b/web/src/config.js index 433e52e1..b41075d9 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,4 +1,4 @@ -export const version = '1.2.0'; +export const version = '1.2.1'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; //export const APIBaseURL = 'http://127.0.0.1:8000';