Merge branch 'master' into release

set wristband status refresh default on
2017-04-28 10:13:06 +08:00 · 2017-04-27 13:18:55 +08:00 · 2017-04-27 11:34:32 +08:00 · 2017-04-27 10:19:39 +08:00 · 2017-04-26 17:49:43 +08:00 · 2017-04-26 17:46:32 +08:00
2 changed files with 5 additions and 4 deletions
@@ -0,0 +1 @@
+wristband-v0.0.1
@@ -29,11 +29,11 @@
        "iogroup": true,
        "iocmd": true,
        "schedule": true,
-        "modbus": true,
+        "modbus": false,
        "link": true,
-        "ipcam": true,
+        "ipcam": false,
        "wristband": true,
-        "server": true
+        "server": false
    },
    "cmdpath": {
        "manualip": "/home/www/cmd/manualip",
@@ -47,4 +47,4 @@
        "htsrt": "/home/www/tmp/rthts",
        "version": "/factory/webioa_version"
    }
-}
+}
Author	SHA1	Message	Date
root	e1fa3d2bc7	Merge branch 'master' into release	2017-04-28 10:13:06 +08:00
root	ee67fb6636	Merge branch 'master' into release	2017-04-27 13:18:55 +08:00
root	08dcdf08ae	set wristband status refresh default on	2017-04-27 11:34:32 +08:00
root	b3e752792d	Merge branch 'master' into release	2017-04-27 10:19:39 +08:00
root	af02ee856d	Merge branch 'master' into release	2017-04-26 17:49:43 +08:00
root	c8c4c28dfc	Merge branch 'master' into release	2017-04-26 17:46:32 +08:00
root	f02af21b7b	Merge branch 'master' into release	2017-04-26 17:34:52 +08:00
root	f64ab2ae82	update	2017-04-26 17:28:37 +08:00
root	06ab118cfe	Merge branch 'master' into release	2017-04-26 17:28:02 +08:00
root	e27d143330	webio ver	2017-04-26 15:06:53 +08:00
root	48b178ac3a	Merge branch 'master' into release	2017-04-26 15:05:28 +08:00
root	847bd06ac6	Merge branch 'master' into release	2017-04-24 16:28:53 +08:00
root	6f50504660	update	2017-04-24 16:28:00 +08:00
root	588c5d77ab	Merge branch 'master' into release	2017-04-21 15:41:46 +08:00
root	9b70a544df	Merge branch 'master' into release	2017-04-20 09:34:25 +08:00
root	b849574ee1	edit config.json to webio version	2017-04-18 14:37:22 +08:00
root	5429ffbb73	make version webio-v0.0.3	2017-04-18 14:28:41 +08:00
root	a4ac4742be	Merge branch 'master' into release	2017-04-18 14:27:56 +08:00
root	54f41a85e6	update wristband v0.0.1	2017-04-13 13:33:35 +08:00
root	6b34422a63	update	2017-04-13 13:32:29 +08:00
root	afd3994e95	update webio-v0.0.2	2017-04-13 13:28:08 +08:00
root	d504f26bda	Merge branch 'master' into release	2017-04-13 13:24:25 +08:00
root	91effa014a	new version wristband-v0.0.1	2017-04-12 14:36:16 +08:00
root	0ea24f857d	Merge branch 'master' into release	2017-04-12 14:32:51 +08:00
root	87525f2597	Merge branch 'master' into release	2017-04-11 16:48:52 +08:00
root	b1ad20d86c	Merge branch 'master' into release	2017-04-10 17:56:19 +08:00
root	7a30f23138	add version file webio-v0.0.2	2017-04-10 10:05:25 +08:00