Commit Graph

1292 Commits (c3467423877927d410e82b59a39748e8b80f6f0c)

Author SHA1 Message Date
13621160019@163.com 16412635ba fixed tpyographical error in Admin UI
Merge branch 'develop'
2021-08-25 17:35:12 +08:00
13621160019@163.com 1b07a2147d fixed typo caused error in Admin UI 2021-08-25 17:33:59 +08:00
13621160019@163.com 0da0eaf1c4 fixed undefined variable error in Admin UI
Merge branch 'develop'
2021-08-25 16:38:01 +08:00
13621160019@163.com 3ef7ce386b fixed undefined variable error in Admin UI 2021-08-25 16:35:44 +08:00
hyh123a 329b5f732b add the judge for admin 2021-08-25 15:49:18 +08:00
hyh123a 0f637e8a4b Merge branch 'develop' into logs 2021-08-25 15:24:08 +08:00
hyh123a cb0ccfddc0 add the tbl_action_logs 2021-08-25 15:14:25 +08:00
hyh123a 3565d0dbcc add the log function and test in equipments 2021-08-25 15:13:34 +08:00
13621160019@163.com 17def9bb9b fixed PEP8 warnings in API
Merge branch 'develop'
2021-08-25 12:01:38 +08:00
13621160019@163.com b389887b50 fixed PEP8 warnings in API 2021-08-25 12:01:14 +08:00
13621160019@163.com c3d8867524 fixed code style warnings in API
Merge branch 'develop'
2021-08-25 10:18:20 +08:00
13621160019@163.com f39ad7f039 fixed code style warnings in API 2021-08-25 10:15:27 +08:00
13621160019@163.com c235dfba2a updated i18n of WebUI
Merge branch 'develop'
2021-08-24 10:47:34 +08:00
13621160019@163.com c996658069 updated i18n in Web UI 2021-08-24 10:46:13 +08:00
13621160019@163.com a588fb253e fixed translation errors in Admin UI
Merge branch 'develop'
2021-08-23 17:33:23 +08:00
13621160019@163.com eb0d1ab56c fixed translation errors in Admin UI 2021-08-23 17:32:50 +08:00
13621160019@163.com 70d26722e5 fixed issues of markdown in README files
Merge branch 'develop'
2021-08-23 16:55:28 +08:00
13621160019@163.com bbbc93acda fixed issues of markdown in README files 2021-08-23 16:53:48 +08:00
13621160019@163.com 5cfbe432db changed user token hash algorithm from sha1 to sha256 in API
Merge branch 'develop'
2021-08-23 15:39:19 +08:00
13621160019@163.com 7766723f60 changed user token hash algorithm from sha1 to sha256 in API 2021-08-23 15:38:49 +08:00
13621160019@163.com ce2e5ce610 fixed typeof issue of dropzone js in Admin UI
Merge branch 'develop'
2021-08-23 14:16:59 +08:00
13621160019@163.com 49a5d433c6 fixed typeof issue of dropzone js in Admin UI 2021-08-23 14:16:37 +08:00
13621160019@163.com 0e68422764 updated README
Merge branch 'develop'
2021-08-23 11:37:02 +08:00
13621160019@163.com a93f148ff8 updated README 2021-08-23 11:36:42 +08:00
13621160019@163.com 3a740fe9fa removed unnecessary dropzone-amd-module library from Admin UI
Merge branch 'develop'
2021-08-22 18:40:44 +08:00
13621160019@163.com 6d7b603aaa removed unnecessary dropzone-amd-module library from Admin UI 2021-08-22 18:40:20 +08:00
13621160019@163.com 8a0dc5b916 upgraded dorpzone js library in Admin UI
Merge branch 'develop'
2021-08-22 18:11:57 +08:00
13621160019@163.com 879d6cf1e5 upgraded dorpzone js library in Admin UI 2021-08-22 18:11:33 +08:00
13621160019@163.com 3bd9132394 moved css files for dropzone from js folder to css folder in Admin UI
Merge branch 'develop'
2021-08-22 18:01:05 +08:00
13621160019@163.com edc324e51e moved css files for dropzone from js folder to css folder in Admin UI 2021-08-22 18:00:48 +08:00
13621160019@163.com 706ac6aba4 fixed toaster issues for uploading file in Admin UI
Merge branch 'develop'
2021-08-22 17:50:11 +08:00
13621160019@163.com e016b1df9b fixed toaster issues for uploading file in Admin UI 2021-08-22 17:49:41 +08:00
13621160019@163.com f898a6fd83 fixed issue of 'typeof' expression is compared to 'null' in Web UI
Merge branch 'develop'
2021-08-22 14:37:47 +08:00
13621160019@163.com f8e5905468 fixed issue of 'typeof' expression is compared to 'null' 2021-08-22 14:37:20 +08:00
13621160019@163.com 2ad33ebcab added default passwords to README
Merge branch 'develop'
2021-08-21 10:29:13 +08:00
13621160019@163.com fd4afe2628 added default passwords to README 2021-08-21 10:28:52 +08:00
13621160019@163.com 0a6635d11e replaced == with === in Web UI
Merge branch 'develop'
2021-08-19 22:44:59 +08:00
13621160019@163.com e71bc4d671 replaced == with === in Web UI 2021-08-19 22:44:29 +08:00
13621160019@163.com 984c65a30f removed unused import from Web UI
Merge branch 'develop'
2021-08-19 22:17:28 +08:00
13621160019@163.com ea5577c2df removed unused import from Web UI 2021-08-19 22:16:52 +08:00
13621160019@163.com 749f50fff2 updated version numbers to 1.2.1
Merge branch 'develop'
2021-08-19 15:33:14 +08:00
13621160019@163.com ad2000c3fe upgraded version numbers to 1.2.1 2021-08-19 15:32:42 +08:00
13621160019@163.com 10adb87ea4 Added Missing Error Messages Words of API to Web UI i18n
Merge branch 'develop'
2021-08-19 15:02:55 +08:00
13621160019@163.com 4712b2f5e0 Added Missing Error Messages Words of API to Web UI i18n
Merge branch 'PR61' into develop
2021-08-19 14:53:53 +08:00
13621160019@163.com 5a4b8755b4 renamed virtualmeter.model.html in Admin UI
Merge branch 'develop'
2021-08-18 10:59:02 +08:00
13621160019@163.com 2555140ad9 renamed virtualmeter.model.html in Admin UI 2021-08-18 10:56:06 +08:00
13621160019@163.com 3bf423f4e1 removed unnecessary jc.jsextend library from Admin UI
Merge branch 'develop'
2021-08-17 22:57:08 +08:00
13621160019@163.com 63d649c16d removed unnecessary jc.jsextend library from Admin UI 2021-08-17 22:56:34 +08:00
13621160019@163.com 79c7725061 fixed debugging code issues in Admin UI 2021-08-17 22:29:08 +08:00
13621160019@163.com 11871210d2 fixed unused code issues in Admin UI
Merge branch 'develop'
2021-08-17 22:11:52 +08:00