Commit Graph

140 Commits (d158a06873c5f86f39b760abbae208282a8032cf)

Author SHA1 Message Date
hyh123a d158a06873 add the excel report of storeenergycategory 2021-02-27 23:08:35 +08:00
13621160019@163.com 143dd46aa2 fixed typo in combinedequipment controller in admin 2021-02-26 18:04:50 +08:00
13621160019@163.com 1399fbc3c8 removed required property from equipment model in admin 2021-02-26 17:57:06 +08:00
13621160019@163.com 74b1374597 updated CHANGELOG 2021-02-26 16:14:26 +08:00
13621160019@163.com c184c6a330 updated Changelog 2021-02-26 16:05:48 +08:00
13621160019@163.com 406b54e14c updated CHANGLOG 2021-02-26 15:33:07 +08:00
13621160019@163.com e940d827a1 merged myems-api 2021-02-26 15:07:38 +08:00
13621160019@163.com 163f580064 updated README and CHANGELOG 2021-02-24 14:52:27 +08:00
13621160019@163.com 4bb02b3561 fixed issue in web EquipmentTracking 2021-02-23 17:49:47 +08:00
13621160019@163.com b6184b0c61 added export button to EquipmentTracking report 2021-02-23 16:24:59 +08:00
13621160019@163.com e860269955 updated CHANGELOG.md 2021-02-23 14:36:56 +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 3f96056042 updated version number to 1.0.5 2021-02-23 13:04:55 +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
13621160019@163.com 2fdf885637 added mirrors to README 2021-02-22 11:11:31 +08:00
13621160019@163.com 375f94ed3a updated READMEs for using gzip on NGINX 2021-02-21 15:54:42 +08:00
13621160019@163.com 19959847ef updated README files 2021-02-21 13:56:12 +08:00
guangyuzhang 8d46a710fd updated gitattributes file 2021-02-20 22:28:24 +08:00
guangyuzhang b4e064c302 updated gitattributes file 2021-02-20 22:25:41 +08:00
guangyuzhang c2fb5e6cc5 added gitattributes file 2021-02-20 22:23:28 +08:00
13621160019@163.com 994f5eb7a4 udpated gitignore files 2021-02-20 20:18:31 +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 01940f2933 updated README 2021-02-19 15:12:13 +08:00
13621160019@163.com 070c7a0d56 merged myems-admin 2021-02-19 14:43:12 +08:00
13621160019@163.com 43a942c19d merged myems-mqtt-publisher 2021-02-19 13:21:05 +08:00
13621160019@163.com cab097fc78 merged myems-aggregation 2021-02-19 13:09:42 +08:00
13621160019@163.com 70467a3755 merged myems-normalization 2021-02-19 12:31:01 +08:00
13621160019@163.com 2265b440ce merged myems-cleaning 2021-02-19 12:11:42 +08:00
13621160019@163.com 3adb582972 merged myems-bacnet 2021-02-19 11:21:43 +08:00
13621160019@163.com fb90e99eb7 merged myems-modbus-tcp 2021-02-19 11:11:20 +08:00
13621160019@163.com ff1818d239 merged myems-database 2021-02-19 10:45:32 +08:00
guangyuzhang 7883bf4d85 Merge branch 'develop' 2021-02-11 11:35:59 +08:00
guangyuzhang ddaa4e91fc updated README 2021-02-11 11:35:48 +08:00
guangyuzhang 5a500a6895 Merge branch 'develop' 2021-02-10 20:20:38 +08:00
guangyuzhang df7a96f91c Merge branch 'pr4' into develop 2021-02-10 20:20:20 +08:00
guangyuzhang ab0803f8b3 updated installation 2021-02-10 20:20:08 +08:00
guangyuzhang caa048229c Merge branch 'develop' 2021-02-08 22:42:26 +08:00
guangyuzhang 5c3cba55c8 fixed typos 2021-02-08 22:42:14 +08:00
guangyuzhang f1d9d335fa Merge branch 'develop' 2021-02-08 22:31:41 +08:00
guangyuzhang a2c2cd65e5 fixed typos 2021-02-08 22:31:02 +08:00
13621160019@163.com 2c4094a28c Merge branch 'develop' 2021-02-08 18:17:49 +08:00
13621160019@163.com 7e3b2f40cb split README for English and German 2021-02-08 18:17:27 +08:00
guangyuzhang b95ec12a69 Merge branch 'develop' 2021-02-06 21:59:50 +08:00
guangyuzhang decec8d6d9 updated README 2021-02-06 21:59:39 +08:00
guangyuzhang 193b41de2f Merge branch 'develop' 2021-02-06 21:23:15 +08:00
guangyuzhang da3218f409 updated README 2021-02-06 21:23:04 +08:00
guangyuzhang 649287aa92 Merge branch 'develop' 2021-02-06 20:58:29 +08:00