From 95e77bcb186063a150c85aaab0ae31636273a732 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Fri, 6 Aug 2021 19:26:41 +0800
Subject: [PATCH] upgraded version number to v1.2.0

---
 CHANGELOG.md                         | 22 +++++++++++++++++++---
 admin/views/common/footer-login.html |  2 +-
 admin/views/common/footer.html       |  2 +-
 web/package.json                     |  2 +-
 web/src/config.js                    |  2 +-
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09998717..00b88c03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 - None.
 
+## [v1.2.0] - 2021-08-08
+### Added
+- Added demo data to database 
+
+### Changed
+- Replaced every_day_* to periodic_* in excelexporters of API
+- Updated Dockerfiles
+
+### Fixed
+- Replaced every_day_* to periodic_* in excelexporters of API
+- Fixed data issues of tbl_menus in database
+
+### Removed
+- Deleted unnecessary words in translantions of Admin UI
+
 ## [v1.1.6] - 2021-08-02
 ### Added
 - Added Meter Batch Analysis Report
@@ -322,9 +337,10 @@ 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.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
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.2.0...HEAD
+[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
diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html
index 004fed78..a6833fdc 100644
--- a/admin/views/common/footer-login.html
+++ b/admin/views/common/footer-login.html
@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.1.6 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.2.0 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html
index fa154d26..8d3d37aa 100644
--- a/admin/views/common/footer.html
+++ b/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.1.6</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.2.0</strong>
     </div>
 </div>
diff --git a/web/package.json b/web/package.json
index 5c79a752..eb09d7fc 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.1.6",
+  "version": "1.2.0",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",
diff --git a/web/src/config.js b/web/src/config.js
index 53dca285..fccf4cbe 100644
--- a/web/src/config.js
+++ b/web/src/config.js
@@ -1,4 +1,4 @@
-export const version = '1.1.6';
+export const version = '1.2.0';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';