|
|
00eb87487e
|
Merge branch 'master' into release
|
2017-05-05 18:02:21 +08:00 |
|
|
|
63520e50d5
|
fix event url
|
2017-05-05 18:01:52 +08:00 |
|
|
|
97cb15bdb1
|
Merge branch 'master' into release
|
2017-05-05 17:25:06 +08:00 |
|
|
|
7826befe8e
|
add del event, add download event, add download event video
|
2017-05-05 17:24:45 +08:00 |
|
|
|
0cd5667f63
|
fix viewimg 404 status
|
2017-05-05 10:45:44 +08:00 |
|
|
|
be4c8fddc6
|
merge master
|
2017-05-04 17:42:22 +08:00 |
|
|
|
a1637181fb
|
Merge branch 'master' into release
|
2017-05-04 17:41:48 +08:00 |
|
|
|
bcc4b1ed7d
|
update
|
2017-05-04 17:29:20 +08:00 |
|
|
|
fbab4f44e8
|
add event history
|
2017-05-04 14:36:29 +08:00 |
|
|
|
af1d96062a
|
modify add ipcam api
|
2017-05-03 17:15:08 +08:00 |
|
|
|
5113518997
|
fix modal bug
|
2017-05-03 13:10:04 +08:00 |
|
|
|
ef5e115b9d
|
update model value
|
2017-05-03 12:00:17 +08:00 |
|
|
|
9ed476df9c
|
add ipcam set page
|
2017-05-03 11:16:01 +08:00 |
|
|
|
27cd09220e
|
update
|
2017-05-02 10:03:13 +08:00 |
|
|
|
bb260bd312
|
update webio-v0.0.3
|
2017-04-28 10:15:51 +08:00 |
|
|
|
e1fa3d2bc7
|
Merge branch 'master' into release
|
2017-04-28 10:13:06 +08:00 |
|
|
|
a8adbf4cfd
|
modify fixmysql code
|
2017-04-28 10:12:50 +08:00 |
|
|
|
efbd54191f
|
update
|
2017-04-27 18:26:40 +08:00 |
|
|
|
ee67fb6636
|
Merge branch 'master' into release
|
2017-04-27 13:18:55 +08:00 |
|
|
|
fec43a6840
|
set wristband status refresh default on
|
2017-04-27 13:18:27 +08:00 |
|
|
|
08dcdf08ae
|
set wristband status refresh default on
|
2017-04-27 11:34:32 +08:00 |
|
|
|
b3e752792d
|
Merge branch 'master' into release
|
2017-04-27 10:19:39 +08:00 |
|
|
|
cf66e9d94e
|
wristband path info add pager
|
2017-04-27 10:19:20 +08:00 |
|
|
|
af02ee856d
|
Merge branch 'master' into release
|
2017-04-26 17:49:43 +08:00 |
|
|
|
5e751abbdc
|
add page control
|
2017-04-26 17:49:14 +08:00 |
|
|
|
c8c4c28dfc
|
Merge branch 'master' into release
|
2017-04-26 17:46:32 +08:00 |
|
|
|
feac093bda
|
update
|
2017-04-26 17:46:25 +08:00 |
|
|
|
f02af21b7b
|
Merge branch 'master' into release
|
2017-04-26 17:34:52 +08:00 |
|
|
|
3062208332
|
fix url
|
2017-04-26 17:34:35 +08:00 |
|
|
|
f64ab2ae82
|
update
|
2017-04-26 17:28:37 +08:00 |
|
|
|
06ab118cfe
|
Merge branch 'master' into release
|
2017-04-26 17:28:02 +08:00 |
|
|
|
712a78c4ed
|
update
|
2017-04-26 17:26:36 +08:00 |
|
|
|
e27d143330
|
webio ver
|
2017-04-26 15:06:53 +08:00 |
|
|
|
48b178ac3a
|
Merge branch 'master' into release
|
2017-04-26 15:05:28 +08:00 |
|
|
|
b07e51ef7c
|
add confirm box
|
2017-04-26 15:05:03 +08:00 |
|
|
|
847bd06ac6
|
Merge branch 'master' into release
|
2017-04-24 16:28:53 +08:00 |
|
|
|
6f50504660
|
update
|
2017-04-24 16:28:00 +08:00 |
|
|
|
27d2209ea2
|
update loss chk
|
2017-04-24 16:25:56 +08:00 |
|
|
|
a4b949bbfe
|
update
|
2017-04-21 17:18:13 +08:00 |
|
|
|
588c5d77ab
|
Merge branch 'master' into release
|
2017-04-21 15:41:46 +08:00 |
|
|
|
768bad6e2d
|
add modbus value convert modal
|
2017-04-21 15:41:28 +08:00 |
|
|
|
9b70a544df
|
Merge branch 'master' into release
|
2017-04-20 09:34:25 +08:00 |
|
|
|
2d958f2d85
|
update
|
2017-04-20 09:30:44 +08:00 |
|
|
|
a92d29e107
|
update
|
2017-04-20 09:29:16 +08:00 |
|
|
|
85cb31b013
|
delete old add link page
|
2017-04-18 15:11:24 +08:00 |
|
|
|
b849574ee1
|
edit config.json to webio version
|
2017-04-18 14:37:22 +08:00 |
|
|
|
5429ffbb73
|
make version webio-v0.0.3
|
2017-04-18 14:28:41 +08:00 |
|
|
|
a4ac4742be
|
Merge branch 'master' into release
|
2017-04-18 14:27:56 +08:00 |
|
|
|
1a0a4fdc4d
|
addlink new func (modbus)
|
2017-04-18 14:16:58 +08:00 |
|
|
|
88255a1ae2
|
new version addlink page
|
2017-04-18 10:25:44 +08:00 |
|
