diff --git a/CHANGELOG.md b/CHANGELOG.md index 92893e3b..cf3c8380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### Added -- added excel exporter of equipmentincome report -- added excel exporter of shopfloorsaving report +- None. + +### Changed +- None. + +### Fixed +- None. + +### Removed +- None. + + +## [v1.0.8] - 2021-03-11 +### Added +- added excel exporter of combinedequipmentstatistics report +- added translation for German +- added excel exporter of storesaving report +- added excel exporter of equipmentincome report +- added excel exporter of shopfloorsaving report - added excel exporter of equipmentload report ### Changed @@ -79,7 +96,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.0.7...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.0.8...HEAD +[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 3ceedced..32fa2dfe 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 d5534c93..becd5fb4 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.0.7 + {{'MY_EMS_NAME' | translate}} V1.0.8
diff --git a/database/upgrade1.0.8.sql b/database/upgrade1.0.8.sql new file mode 100644 index 00000000..4f79b759 --- /dev/null +++ b/database/upgrade1.0.8.sql @@ -0,0 +1,3 @@ + +-- UPDATE VERSION NUMBER +UPDATE myems_system_db.tbl_versions SET version='1.0.8', release_date='2021-03-11' WHERE id=1; diff --git a/myems-api/core/version.py b/myems-api/core/version.py index 041ded6e..8b9ea71a 100644 --- a/myems-api/core/version.py +++ b/myems-api/core/version.py @@ -14,8 +14,8 @@ class VersionItem: @staticmethod def on_get(req, resp): - result = {"version": 'MyEMS 1.0.7 (Community Edition)', - "release-date": '20210307', + result = {"version": 'MyEMS 1.0.8 (Community Edition)', + "release-date": '202103011', "website": "https://myems.io"} resp.body = json.dumps(result) diff --git a/web/package.json b/web/package.json index d195882f..fb9b9cda 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "myems", - "version": "1.0.7", + "version": "1.0.8", "private": true, "dependencies": { "@fortawesome/fontawesome-svg-core": "^1.2.28", diff --git a/web/src/config.js b/web/src/config.js index 423bd3fa..3fb58d69 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,4 +1,4 @@ -export const version = '1.0.7'; +export const version = '1.0.8'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; //export const APIBaseURL = 'http://127.0.0.1:8000';