Commit Graph

21 Commits

Author SHA1 Message Date
Jay be4c8fddc6 merge master 2017-05-04 17:42:22 +08:00
Jay a1637181fb Merge branch 'master' into release 2017-05-04 17:41:48 +08:00
Jay af1d96062a modify add ipcam api 2017-05-03 17:15:08 +08:00
Jay 9ed476df9c add ipcam set page 2017-05-03 11:16:01 +08:00
Jay bb260bd312 update webio-v0.0.3 2017-04-28 10:15:51 +08:00
Jay f64ab2ae82 update 2017-04-26 17:28:37 +08:00
Jay e27d143330 webio ver 2017-04-26 15:06:53 +08:00
Jay 6f50504660 update 2017-04-24 16:28:00 +08:00
Jay b849574ee1 edit config.json to webio version 2017-04-18 14:37:22 +08:00
Jay 54f41a85e6 update wristband v0.0.1 2017-04-13 13:33:35 +08:00
Jay 6b34422a63 update 2017-04-13 13:32:29 +08:00
Jay d504f26bda Merge branch 'master' into release 2017-04-13 13:24:25 +08:00
Jay e3a3307340 update 2017-04-13 13:14:08 +08:00
Jay 91effa014a new version wristband-v0.0.1 2017-04-12 14:36:16 +08:00
Jay f8f3cbe0d8 update wristband api and add wristband ui 2017-03-31 09:19:16 +08:00
Jay 3e66691b67 add modbus log 2017-03-29 15:06:50 +08:00
Jay 77bf5f58d2 fix mysql pool release and add wristband api 2017-03-28 16:34:50 +08:00
Jay 7f93ea3bd6 add ipcam permission 2017-03-27 14:53:02 +08:00
Jay 33872d0f92 update 2017-03-23 16:42:12 +08:00
Jay 7255b3fdd2 addlink page fin 2017-03-23 16:36:03 +08:00
Jay 8947715671 re commit 2017-03-22 13:35:45 +08:00