diff --git a/CHANGELOG.md b/CHANGELOG.md index ccba4cb3..09998717 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. +## [v1.1.6] - 2021-08-02 +### Added +- Added Meter Batch Analysis Report +- Added Child Space Share Pies for SpaceCost in Web UI +- Added Web UI & Admin UI Installation Guide on Apache Web Server +- Added Docerfiles +- Added Customized Menus in Web UI, API and Admin UI + +### Changed +- None. + +### Fixed +- Upgraded jquery to v2.2.4 in Admin UI + +### Removed +- None. + ## [v1.1.5] - 2021-07-20 ### Added - None. @@ -305,7 +322,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.1.5...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.1.6...HEAD +[v1.1.4]: https://github.com/MyEMS/myems/compare/v1.1.5...v1.1.6 [v1.1.4]: 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 diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index 1afcea91..004fed78 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 a4696bb9..fa154d26 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.1.5 + {{'MY_EMS_NAME' | translate}} v1.1.6
diff --git a/web/package.json b/web/package.json index 451a21ea..5c79a752 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "myems", - "version": "1.1.5", + "version": "1.1.6", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", diff --git a/web/src/config.js b/web/src/config.js index bf464527..53dca285 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,4 +1,4 @@ -export const version = '1.1.5'; +export const version = '1.1.6'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; //export const APIBaseURL = 'http://127.0.0.1:8000';