13621160019@163.com
|
a4d1e9ec0d
|
Merge branch 'PR'
|
2022-04-22 17:52:57 +08:00 |
|
Caozhenhui
|
dae6d2db2f
|
added apache2 proxy setting
|
2022-04-22 17:29:44 +08:00 |
|
Caozhenhui
|
28cdf06664
|
added apache2 proxy setting
|
2022-04-22 16:57:56 +08:00 |
|
13621160019@163.com
|
7d98241028
|
Merge branch 'develop'
|
2022-04-18 15:32:09 +08:00 |
|
13621160019@163.com
|
6c70ad48a1
|
updated user insert sql statement for failed_login_count
|
2022-04-18 15:22:00 +08:00 |
|
13621160019@163.com
|
22ef252326
|
Merge branch 'develop'
|
2022-04-17 22:53:05 +08:00 |
|
13621160019@163.com
|
4d5a7ced33
|
replaced true with 1 in SQL statements of myems-api
|
2022-04-17 22:49:43 +08:00 |
|
13621160019@163.com
|
f72488e257
|
Merge branch 'develop'
|
2022-04-17 20:20:32 +08:00 |
|
13621160019@163.com
|
ce1ab06770
|
fixed typo in virtualmetercarbon
|
2022-04-17 20:17:38 +08:00 |
|
13621160019@163.com
|
47d43c6792
|
Merge branch 'develop'
|
2022-04-16 20:17:36 +08:00 |
|
13621160019@163.com
|
05367b397c
|
updated version number to v1.9.0
|
2022-04-16 20:15:10 +08:00 |
|
13621160019@163.com
|
2b34801ec4
|
Merge branch 'develop'
|
2022-04-16 17:45:23 +08:00 |
|
13621160019@163.com
|
35080f0007
|
Removed search box from navbar of web ui
|
2022-04-16 17:39:14 +08:00 |
|
13621160019@163.com
|
5285ab78b3
|
Merge branch 'PR' into develop
|
2022-04-16 17:35:32 +08:00 |
|
13621160019@163.com
|
1e41040569
|
Merge branch 'develop'
|
2022-04-16 16:20:36 +08:00 |
|
13621160019@163.com
|
4f8d52331a
|
updated web ui nginx conf
|
2022-04-16 15:44:53 +08:00 |
|
13621160019@163.com
|
a515993039
|
Merge branch 'develop'
|
2022-04-16 15:43:01 +08:00 |
|
13621160019@163.com
|
6d35468528
|
updated myems aggregation service README
|
2022-04-16 15:42:19 +08:00 |
|
13621160019@163.com
|
847729068c
|
Merge branch 'develop'
|
2022-04-13 16:37:37 +08:00 |
|
13621160019@163.com
|
9606d60f55
|
removed dictionary based cursors from api/reports
|
2022-04-13 16:29:31 +08:00 |
|
YangZhang-GitHub
|
6721a62e35
|
Delete the search box
|
2022-04-13 16:11:10 +08:00 |
|
13621160019@163.com
|
be90a24883
|
Merge branch 'develop'
|
2022-04-13 15:11:52 +08:00 |
|
13621160019@163.com
|
e5a8c38ed2
|
removed dictionary based cursors from api/core
|
2022-04-13 15:08:43 +08:00 |
|
13621160019@163.com
|
168b92459f
|
Merge branch 'develop'
|
2022-04-12 22:25:33 +08:00 |
|
13621160019@163.com
|
891f77b5d4
|
removed dictionary parameter from cursor in combined equipment api
|
2022-04-12 22:22:47 +08:00 |
|
13621160019@163.com
|
3065e17d66
|
Merge branch 'develop'
|
2022-04-10 22:16:27 +08:00 |
|
13621160019@163.com
|
8e7c30cafa
|
removed ID limitation from on_delete of shopfloor api
|
2022-04-10 22:15:04 +08:00 |
|
13621160019@163.com
|
ae2bd5ed7e
|
fixed tuple index error in combinedequipment api
|
2022-04-10 20:42:14 +08:00 |
|
13621160019@163.com
|
8a59f171b0
|
Merge branch 'develop'
|
2022-04-09 19:41:49 +08:00 |
|
13621160019@163.com
|
65feff7c88
|
updated enterprise edition introduction
|
2022-04-09 19:39:11 +08:00 |
|
13621160019@163.com
|
227fb6b20b
|
Merge branch 'develop'
|
2022-04-09 00:30:00 +08:00 |
|
13621160019@163.com
|
f190c9d5c3
|
added length parameter to mysql substring function in myems-api
|
2022-04-09 00:28:11 +08:00 |
|
13621160019@163.com
|
7a3fbbd1a8
|
Merge branch 'develop'
|
2022-04-08 23:09:12 +08:00 |
|
13621160019@163.com
|
e4fd38b18d
|
removed cursor dictionary parameter from combinedequipment in myems-api
|
2022-04-07 22:09:33 +08:00 |
|
13621160019@163.com
|
3f99722fda
|
Merge branch 'develop'
|
2022-04-07 22:03:07 +08:00 |
|
13621160019@163.com
|
5d17818ae0
|
removed cursor dictionary parameter from combinedequipment in myems-api
|
2022-04-07 22:01:05 +08:00 |
|
13621160019@163.com
|
44f32f2c17
|
Merge branch 'develop'
|
2022-04-07 17:44:53 +08:00 |
|
13621160019@163.com
|
4ff1177ce7
|
fixed Meter list search and clear issue
|
2022-04-07 17:43:11 +08:00 |
|
13621160019@163.com
|
dcac6c5381
|
Merge branch 'PR' into develop
|
2022-04-07 17:31:20 +08:00 |
|
Caozhenhui
|
3bb4dada58
|
resolve issue I4ZNLO
|
2022-04-07 09:59:24 +08:00 |
|
Caozhenhui
|
2b6b824e0b
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2022-04-07 09:38:23 +08:00 |
|
13621160019@163.com
|
3389c5ed1c
|
Merge branch 'develop'
|
2022-04-06 22:14:27 +08:00 |
|
13621160019@163.com
|
7c4f5eae1a
|
updated database demo data
|
2022-04-06 22:12:41 +08:00 |
|
Caozhenhui
|
1141fa62f4
|
resolve issue I4ZNLO
|
2022-04-06 17:11:51 +08:00 |
|
13621160019@163.com
|
23cdb1f5b3
|
Merge branch 'develop'
|
2022-04-04 19:09:04 +08:00 |
|
13621160019@163.com
|
c7f50376fd
|
added telnet to Dockerfile
|
2022-04-04 19:06:56 +08:00 |
|
13621160019@163.com
|
1bf05ecbc1
|
Merge branch 'develop'
|
2022-04-04 18:01:54 +08:00 |
|
13621160019@163.com
|
a1e894cf5f
|
added nano to Dockfile
|
2022-04-04 17:53:44 +08:00 |
|
13621160019@163.com
|
999435c853
|
Merge branch 'develop'
|
2022-04-03 09:34:37 +08:00 |
|
13621160019@163.com
|
9e1c35bcb4
|
updated docker instruction in README
|
2022-04-03 09:30:12 +08:00 |