seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • c184c6a330 updated Changelog 13621160019@163.com 2021-02-26 16:05:48 +0800
  • c1550d2fd7 Merge branch 'develop' v1.0.6 13621160019@163.com 2021-02-26 15:34:22 +0800
  • 406b54e14c updated CHANGLOG 13621160019@163.com 2021-02-26 15:32:46 +0800
  • 349e42bebb Merge branch 'develop' 13621160019@163.com 2021-02-26 15:09:29 +0800
  • e940d827a1 merged myems-api 13621160019@163.com 2021-02-26 15:07:38 +0800
  • a1a4e15c52 Merge branch 'develop' 13621160019@163.com 2021-02-24 14:52:54 +0800
  • 163f580064 updated README and CHANGELOG 13621160019@163.com 2021-02-24 14:52:27 +0800
  • d55883a8cf Merge branch 'develop' 13621160019@163.com 2021-02-23 17:50:08 +0800
  • 4bb02b3561 fixed issue in web EquipmentTracking 13621160019@163.com 2021-02-23 17:49:47 +0800
  • 14fa94056b
         Merge pull request #2 from MyEMS/develop tianlinzhong 2021-02-23 16:42:09 +0800
  • 4808bbad27 Merge branch 'develop' 13621160019@163.com 2021-02-23 16:26:45 +0800
  • b6184b0c61 added export button to EquipmentTracking report 13621160019@163.com 2021-02-23 16:24:59 +0800
  • 8cf32e64bf Merge branch 'develop' 13621160019@163.com 2021-02-23 14:41:11 +0800
  • e860269955 updated CHANGELOG.md 13621160019@163.com 2021-02-23 14:36:56 +0800
  • c716290547 Merge branch 'develop' 13621160019@163.com 2021-02-23 14:18:43 +0800
  • d59d0a7f1d added changelog 13621160019@163.com 2021-02-23 14:18:20 +0800
  • 70659c7897 fixed energy category names and units issue in EnergyItem reports 13621160019@163.com 2021-02-23 14:16:19 +0800
  • da60ef36ec Merge branch 'develop' v1.0.5 13621160019@163.com 2021-02-23 13:05:22 +0800
  • 3f96056042 updated version number to 1.0.5 13621160019@163.com 2021-02-23 13:04:55 +0800
  • 83a59b94d6
         Merge pull request #3 from MyEMS/master YangZhang-GitHub 2021-02-22 16:20:02 +0800
  • 868ae7ed75
         Merge pull request #4 from MyEMS/develop YangZhang-GitHub 2021-02-22 16:19:19 +0800
  • 1b89c26678 Merge branch 'develop' 13621160019@163.com 2021-02-22 15:50:39 +0800
  • 1ae965d7f9 modified gitignore file in admin & updated READMEs 13621160019@163.com 2021-02-22 15:50:00 +0800
  • 06eb9ae4c2 modified gitignore file in admin 13621160019@163.com 2021-02-22 15:49:08 +0800
  • a3086b6753
         Merge pull request #2 from MyEMS/develop YangZhang-GitHub 2021-02-22 14:13:12 +0800
  • d71cd0414e
         Merge pull request #1 from MyEMS/master YangZhang-GitHub 2021-02-22 14:09:24 +0800
  • 22c237cf63 Merge branch 'develop' 13621160019@163.com 2021-02-22 11:12:36 +0800
  • 2fdf885637 added mirrors to README 13621160019@163.com 2021-02-22 11:11:31 +0800
  • 5efbff712f Merge branch 'develop' 13621160019@163.com 2021-02-21 15:55:07 +0800
  • 375f94ed3a updated READMEs for using gzip on NGINX 13621160019@163.com 2021-02-21 15:54:08 +0800
  • 34b0cbe746 Merge branch 'develop' 13621160019@163.com 2021-02-21 13:56:57 +0800
  • 19959847ef updated README files 13621160019@163.com 2021-02-21 13:56:12 +0800
  • e147cbed69 udpated .gitattributes file guangyuzhang 2021-02-20 22:30:17 +0800
  • 8d46a710fd updated gitattributes file guangyuzhang 2021-02-20 22:28:24 +0800
  • 82fcc31043 Merge branch 'develop' guangyuzhang 2021-02-20 22:25:55 +0800
  • b4e064c302 updated gitattributes file guangyuzhang 2021-02-20 22:25:41 +0800
  • a9f79e95fb Merge branch 'develop' guangyuzhang 2021-02-20 22:23:52 +0800
  • c2fb5e6cc5 added gitattributes file guangyuzhang 2021-02-20 22:23:28 +0800
  • cbf9430179 Merge branch 'develop' 13621160019@163.com 2021-02-20 20:19:42 +0800
  • 994f5eb7a4 udpated gitignore files 13621160019@163.com 2021-02-20 20:18:31 +0800
  • a4d61eb3d6 Merge branch 'develop' 13621160019@163.com 2021-02-20 20:09:53 +0800
  • 6514e753d0 updated gitignore files 13621160019@163.com 2021-02-20 20:04:48 +0800
  • bb7bf14033 merged myems-web 13621160019@163.com 2021-02-20 19:34:53 +0800
  • c21bab44c2 Merge branch 'develop' 13621160019@163.com 2021-02-19 15:12:38 +0800
  • 01940f2933 updated README 13621160019@163.com 2021-02-19 15:12:13 +0800
  • c026e7c880 Merge branch 'develop' 13621160019@163.com 2021-02-19 14:48:53 +0800
  • 070c7a0d56 merged myems-admin 13621160019@163.com 2021-02-19 14:43:12 +0800
  • e19ac8ab2e Merge branch 'develop' 13621160019@163.com 2021-02-19 13:21:35 +0800
  • 43a942c19d merged myems-mqtt-publisher 13621160019@163.com 2021-02-19 13:21:05 +0800
  • 3f7f6d61d8 Merge branch 'develop' 13621160019@163.com 2021-02-19 13:10:09 +0800
  • cab097fc78 merged myems-aggregation 13621160019@163.com 2021-02-19 13:09:42 +0800
  • 65329638df Merge branch 'develop' 13621160019@163.com 2021-02-19 12:31:28 +0800
  • 70467a3755 merged myems-normalization 13621160019@163.com 2021-02-19 12:31:01 +0800
  • 643405942a Merge branch 'develop' 13621160019@163.com 2021-02-19 12:12:09 +0800
  • 2265b440ce merged myems-cleaning 13621160019@163.com 2021-02-19 12:11:42 +0800
  • 3a7f91296e Merge branch 'develop' 13621160019@163.com 2021-02-19 11:22:09 +0800
  • 3adb582972 merged myems-bacnet 13621160019@163.com 2021-02-19 11:21:43 +0800
  • f1101fe181 Merge branch 'develop' 13621160019@163.com 2021-02-19 11:16:06 +0800
  • fb90e99eb7 merged myems-modbus-tcp 13621160019@163.com 2021-02-19 11:11:20 +0800
  • ce3f5e280a Merge branch 'develop' 13621160019@163.com 2021-02-19 10:46:11 +0800
  • ff1818d239 merged myems-database 13621160019@163.com 2021-02-19 10:45:32 +0800
  • 7883bf4d85 Merge branch 'develop' guangyuzhang 2021-02-11 11:35:59 +0800
  • ddaa4e91fc updated README guangyuzhang 2021-02-11 11:35:48 +0800
  • 5a500a6895 Merge branch 'develop' guangyuzhang 2021-02-10 20:20:38 +0800
  • df7a96f91c Merge branch 'pr4' into develop guangyuzhang 2021-02-10 20:20:20 +0800
  • ab0803f8b3 updated installation guangyuzhang 2021-02-10 20:20:08 +0800
  • caa048229c Merge branch 'develop' guangyuzhang 2021-02-08 22:42:26 +0800
  • 5c3cba55c8 fixed typos guangyuzhang 2021-02-08 22:42:14 +0800
  • f1d9d335fa Merge branch 'develop' guangyuzhang 2021-02-08 22:31:41 +0800
  • a2c2cd65e5 fixed typos guangyuzhang 2021-02-08 22:31:02 +0800
  • 2c4094a28c Merge branch 'develop' 13621160019@163.com 2021-02-08 18:17:49 +0800
  • 7e3b2f40cb split README for English and German 13621160019@163.com 2021-02-08 18:17:27 +0800
  • b95ec12a69 Merge branch 'develop' guangyuzhang 2021-02-06 21:59:50 +0800
  • decec8d6d9 updated README guangyuzhang 2021-02-06 21:59:39 +0800
  • 193b41de2f Merge branch 'develop' guangyuzhang 2021-02-06 21:23:15 +0800
  • da3218f409 updated README guangyuzhang 2021-02-06 21:23:04 +0800
  • 649287aa92 Merge branch 'develop' guangyuzhang 2021-02-06 20:58:29 +0800
  • 2db35367e6 updated README guangyuzhang 2021-02-06 20:58:14 +0800
  • 13a52377b7 Merge branch 'develop' guangyuzhang 2021-02-06 20:47:43 +0800
  • ab4a336245 updated README guangyuzhang 2021-02-06 20:47:20 +0800
  • d4ed39596c Merge branch 'develop' guangyuzhang 2021-02-05 21:28:07 +0800
  • cdced72ace updated README guangyuzhang 2021-02-05 21:27:54 +0800
  • ec0a319f88 Merge branch 'develop' guangyuzhang 2021-02-05 21:13:04 +0800
  • 4a847803ad updated README guangyuzhang 2021-02-05 21:12:41 +0800
  • 8d03f1d259 Merge branch 'develop' guangyuzhang 2021-02-04 21:03:28 +0800
  • 6149a9d8aa updated README guangyuzhang 2021-02-04 21:03:16 +0800
  • 239913442a Merge branch 'develop' guangyuzhang 2021-02-04 20:43:36 +0800
  • baae7b05d8 updated README Guangyu Zhang 2021-02-04 20:41:39 +0800
  • 6464c3ceaa 我完成了安装说明 YangZhang-GitHub 2021-01-13 16:34:05 +0800
  • cfe8e7d92a Merge branch 'develop' 13621160019@163.com 2020-12-02 18:59:05 +0800
  • c8228e0d84 added installation page 13621160019@163.com 2020-12-02 18:58:57 +0800
  • afafd3d851 Merge branch 'develop' 13621160019@163.com 2020-12-02 17:43:22 +0800
  • 7cc3b29fe0 updated introduction 13621160019@163.com 2020-12-02 17:43:12 +0800
  • 725ef4b8c4 Merge branch 'develop' 13621160019@163.com 2020-12-02 17:38:05 +0800
  • 56538fc4ea added new pages 13621160019@163.com 2020-12-02 17:37:55 +0800
  • 730f6da24b Merge branch 'develop' 13621160019@163.com 2020-12-02 17:27:20 +0800
  • ce7fb89638 added new pages 13621160019@163.com 2020-12-02 17:27:12 +0800
  • cedf9853e5 Merge branch 'develop' 13621160019@163.com 2020-12-02 15:15:08 +0800
  • abbca24ee2 fixed typos 13621160019@163.com 2020-12-02 15:14:55 +0800
  • fd6fce95c2 Merge branch 'develop' 13621160019@163.com 2020-12-02 15:10:50 +0800