13621160019@163.com
|
4847a8d179
|
Merge branch 'develop'
|
2021-02-26 16:15:21 +08:00 |
|
13621160019@163.com
|
74b1374597
|
updated CHANGELOG
|
2021-02-26 16:14:26 +08:00 |
|
13621160019@163.com
|
86438837a4
|
Merge branch 'develop'
|
2021-02-26 16:11:11 +08:00 |
|
13621160019@163.com
|
c184c6a330
|
updated Changelog
|
2021-02-26 16:05:48 +08:00 |
|
13621160019@163.com
|
c1550d2fd7
|
Merge branch 'develop'
|
2021-02-26 15:34:22 +08:00 |
|
13621160019@163.com
|
406b54e14c
|
updated CHANGLOG
|
2021-02-26 15:33:07 +08:00 |
|
13621160019@163.com
|
349e42bebb
|
Merge branch 'develop'
|
2021-02-26 15:09:29 +08:00 |
|
13621160019@163.com
|
e940d827a1
|
merged myems-api
|
2021-02-26 15:07:38 +08:00 |
|
13621160019@163.com
|
a1a4e15c52
|
Merge branch 'develop'
|
2021-02-24 14:52:54 +08:00 |
|
13621160019@163.com
|
163f580064
|
updated README and CHANGELOG
|
2021-02-24 14:52:27 +08:00 |
|
13621160019@163.com
|
d55883a8cf
|
Merge branch 'develop'
|
2021-02-23 17:50:08 +08:00 |
|
13621160019@163.com
|
4bb02b3561
|
fixed issue in web EquipmentTracking
|
2021-02-23 17:49:47 +08:00 |
|
tianlinzhong
|
14fa94056b
|
Merge pull request #2 from MyEMS/develop
Develop
|
2021-02-23 16:42:09 +08:00 |
|
13621160019@163.com
|
4808bbad27
|
Merge branch 'develop'
|
2021-02-23 16:26:45 +08:00 |
|
13621160019@163.com
|
b6184b0c61
|
added export button to EquipmentTracking report
|
2021-02-23 16:24:59 +08:00 |
|
13621160019@163.com
|
8cf32e64bf
|
Merge branch 'develop'
|
2021-02-23 14:41:11 +08:00 |
|
13621160019@163.com
|
e860269955
|
updated CHANGELOG.md
|
2021-02-23 14:36:56 +08:00 |
|
13621160019@163.com
|
c716290547
|
Merge branch 'develop'
|
2021-02-23 14:18:43 +08:00 |
|
13621160019@163.com
|
d59d0a7f1d
|
added changelog
|
2021-02-23 14:18:20 +08:00 |
|
13621160019@163.com
|
70659c7897
|
fixed energy category names and units issue in EnergyItem reports
|
2021-02-23 14:16:19 +08:00 |
|
13621160019@163.com
|
da60ef36ec
|
Merge branch 'develop'
|
2021-02-23 13:05:22 +08:00 |
|
13621160019@163.com
|
3f96056042
|
updated version number to 1.0.5
|
2021-02-23 13:04:55 +08:00 |
|
YangZhang-GitHub
|
83a59b94d6
|
Merge pull request #3 from MyEMS/master
develop
|
2021-02-22 16:20:02 +08:00 |
|
YangZhang-GitHub
|
868ae7ed75
|
Merge pull request #4 from MyEMS/develop
Develop
|
2021-02-22 16:19:19 +08:00 |
|
13621160019@163.com
|
1b89c26678
|
Merge branch 'develop'
|
2021-02-22 15:50:39 +08:00 |
|
13621160019@163.com
|
1ae965d7f9
|
modified gitignore file in admin & updated READMEs
|
2021-02-22 15:50:00 +08:00 |
|
13621160019@163.com
|
06eb9ae4c2
|
modified gitignore file in admin
|
2021-02-22 15:49:08 +08:00 |
|
YangZhang-GitHub
|
a3086b6753
|
Merge pull request #2 from MyEMS/develop
Develop
|
2021-02-22 14:13:12 +08:00 |
|
YangZhang-GitHub
|
d71cd0414e
|
Merge pull request #1 from MyEMS/master
develop
|
2021-02-22 14:09:24 +08:00 |
|
13621160019@163.com
|
22c237cf63
|
Merge branch 'develop'
|
2021-02-22 11:12:36 +08:00 |
|
13621160019@163.com
|
2fdf885637
|
added mirrors to README
|
2021-02-22 11:11:31 +08:00 |
|
13621160019@163.com
|
5efbff712f
|
Merge branch 'develop'
|
2021-02-21 15:55:07 +08:00 |
|
13621160019@163.com
|
375f94ed3a
|
updated READMEs for using gzip on NGINX
|
2021-02-21 15:54:42 +08:00 |
|
13621160019@163.com
|
34b0cbe746
|
Merge branch 'develop'
|
2021-02-21 13:56:57 +08:00 |
|
13621160019@163.com
|
19959847ef
|
updated README files
|
2021-02-21 13:56:12 +08:00 |
|
guangyuzhang
|
e147cbed69
|
udpated .gitattributes file
|
2021-02-20 22:30:17 +08:00 |
|
guangyuzhang
|
8d46a710fd
|
updated gitattributes file
|
2021-02-20 22:28:24 +08:00 |
|
guangyuzhang
|
82fcc31043
|
Merge branch 'develop'
|
2021-02-20 22:25:55 +08:00 |
|
guangyuzhang
|
b4e064c302
|
updated gitattributes file
|
2021-02-20 22:25:41 +08:00 |
|
guangyuzhang
|
a9f79e95fb
|
Merge branch 'develop'
|
2021-02-20 22:23:52 +08:00 |
|
guangyuzhang
|
c2fb5e6cc5
|
added gitattributes file
|
2021-02-20 22:23:28 +08:00 |
|
13621160019@163.com
|
cbf9430179
|
Merge branch 'develop'
|
2021-02-20 20:19:42 +08:00 |
|
13621160019@163.com
|
994f5eb7a4
|
udpated gitignore files
|
2021-02-20 20:18:31 +08:00 |
|
13621160019@163.com
|
a4d61eb3d6
|
Merge branch 'develop'
|
2021-02-20 20:09:53 +08:00 |
|
13621160019@163.com
|
6514e753d0
|
updated gitignore files
|
2021-02-20 20:04:48 +08:00 |
|
13621160019@163.com
|
bb7bf14033
|
merged myems-web
|
2021-02-20 19:34:53 +08:00 |
|
13621160019@163.com
|
c21bab44c2
|
Merge branch 'develop'
|
2021-02-19 15:12:38 +08:00 |
|
13621160019@163.com
|
01940f2933
|
updated README
|
2021-02-19 15:12:13 +08:00 |
|
13621160019@163.com
|
c026e7c880
|
Merge branch 'develop'
|
2021-02-19 14:48:53 +08:00 |
|
13621160019@163.com
|
070c7a0d56
|
merged myems-admin
|
2021-02-19 14:43:12 +08:00 |