From fd990f94b9526653066cf2af7d56ccfa98d6671d Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Tue, 20 Jul 2021 18:57:27 +0800
Subject: [PATCH] upgraded to v1.1.5

---
 CHANGELOG.md                         | 17 ++++++++++++++++-
 admin/views/common/footer-login.html |  2 +-
 admin/views/common/footer.html       |  2 +-
 database/upgrade1.1.5.sql            |  3 +++
 web/package-lock.json                |  2 +-
 web/package.json                     |  2 +-
 web/src/config.js                    |  2 +-
 7 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 database/upgrade1.1.5.sql

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9d9c351..ccba4cb3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 - None.
 
+## [v1.1.5] - 2021-07-20
+### Added
+- None.
+
+### Changed
+- changed all worksheet names of Excel exporters in API
+
+### Fixed
+- updated upgrade1.1.4 sql
+- fixed issue of gitignore in Admin UI
+
+### Removed
+- None.
+
 ## [v1.1.4] - 2021-07-19
 ### Added
 - added tbl_email_messages to myems_reporting_db
@@ -291,7 +305,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.4...HEAD
+[Unreleased]: https://github.com/MyEMS/myems/compare/v1.1.5...HEAD
+[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
 [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 b1475cd9..1afcea91 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.4 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.1.5 <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 eb30f48e..a4696bb9 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.4</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.1.5</strong>
     </div>
 </div>
diff --git a/database/upgrade1.1.5.sql b/database/upgrade1.1.5.sql
new file mode 100644
index 00000000..fde81747
--- /dev/null
+++ b/database/upgrade1.1.5.sql
@@ -0,0 +1,3 @@
+
+-- UPDATE VERSION NUMBER
+UPDATE myems_system_db.tbl_versions SET version='1.1.5', release_date='2021-07-20' WHERE id=1;
diff --git a/web/package-lock.json b/web/package-lock.json
index c13bc18c..f030a3cd 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/web/package.json b/web/package.json
index 7aa98511..451a21ea 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.1",
diff --git a/web/src/config.js b/web/src/config.js
index 7a4c1a0d..bf464527 100644
--- a/web/src/config.js
+++ b/web/src/config.js
@@ -1,4 +1,4 @@
-export const version = '1.1.4';
+export const version = '1.1.5';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';