Merge branch 'develop'

MyEMS · May 11, 2023 · e7a3664 · e7a3664
2 parents ce0ea3b + c2ded35
commit e7a3664
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,12 +7,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Added captcha to myems-web login form
 - Added captcha to myems-admin login form
+- Added higher limit and lower limit to tbl_points in database
+- Added is_in_alarm to tbl_points in database
+- Added new rule fdd codes to myems-admin
 
 ### Changed
-- None
+- Updated English Translation in myems-admin 
 
 ### Fixed
-- None 
+- Fixed typo in database
+- Fixed typo of error description in myems-api
 
 ### Removed
 - Removed legacy docs for readthedocs, and replaced with https://myems.io

diff --git a/myems-admin/app/translations.js b/myems-admin/app/translations.js
@@ -496,6 +496,9 @@ function config($translateProvider) {
                 BIND_TENANT: 'Bind Tenant',
                 N_S_TENANT: 'Bound Tenants',
                 TENANT_LIST: 'Tenant List',
+                BIND_SHOPFLOOR: 'Bind Shopfloor',
+                N_S_SHOPFLOOR: 'Bound Shopfloor',
+                SHOPFLOOR_LIST: 'Shopfloor List',
             },
             STORE: {
                 ADDRESS: 'Address',