Commit Graph
100 Commits
Author SHA1 Message Date
root 97cb15bdb1 Merge branch 'master' into release 2017-05-05 17:25:06 +08:00
root 7826befe8e add del event, add download event, add download event video 2017-05-05 17:24:45 +08:00
root 0cd5667f63 fix viewimg 404 status 2017-05-05 10:45:44 +08:00
root be4c8fddc6 merge master 2017-05-04 17:42:22 +08:00
root a1637181fb Merge branch 'master' into release 2017-05-04 17:41:48 +08:00
root bcc4b1ed7d update 2017-05-04 17:29:20 +08:00
root fbab4f44e8 add event history 2017-05-04 14:36:29 +08:00
root af1d96062a modify add ipcam api 2017-05-03 17:15:08 +08:00
root 5113518997 fix modal bug 2017-05-03 13:10:04 +08:00
root ef5e115b9d update model value 2017-05-03 12:00:17 +08:00
root 9ed476df9c add ipcam set page 2017-05-03 11:16:01 +08:00
root 27cd09220e update 2017-05-02 10:03:13 +08:00
root bb260bd312 update webio-v0.0.3 2017-04-28 10:15:51 +08:00
root e1fa3d2bc7 Merge branch 'master' into release 2017-04-28 10:13:06 +08:00
root a8adbf4cfd modify fixmysql code 2017-04-28 10:12:50 +08:00
root efbd54191f update 2017-04-27 18:26:40 +08:00
root ee67fb6636 Merge branch 'master' into release 2017-04-27 13:18:55 +08:00
root fec43a6840 set wristband status refresh default on 2017-04-27 13:18:27 +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 cf66e9d94e wristband path info add pager 2017-04-27 10:19:20 +08:00
root af02ee856d Merge branch 'master' into release 2017-04-26 17:49:43 +08:00
root 5e751abbdc add page control 2017-04-26 17:49:14 +08:00
root c8c4c28dfc Merge branch 'master' into release 2017-04-26 17:46:32 +08:00
root feac093bda update 2017-04-26 17:46:25 +08:00
root f02af21b7b Merge branch 'master' into release 2017-04-26 17:34:52 +08:00
root 3062208332 fix url 2017-04-26 17:34:35 +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 712a78c4ed update 2017-04-26 17:26:36 +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 b07e51ef7c add confirm box 2017-04-26 15:05:03 +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 27d2209ea2 update loss chk 2017-04-24 16:25:56 +08:00
root a4b949bbfe update 2017-04-21 17:18:13 +08:00
root 588c5d77ab Merge branch 'master' into release 2017-04-21 15:41:46 +08:00
root 768bad6e2d add modbus value convert modal 2017-04-21 15:41:28 +08:00
root 9b70a544df Merge branch 'master' into release 2017-04-20 09:34:25 +08:00
root 2d958f2d85 update 2017-04-20 09:30:44 +08:00
root a92d29e107 update 2017-04-20 09:29:16 +08:00
root 85cb31b013 delete old add link page 2017-04-18 15:11:24 +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 1a0a4fdc4d addlink new func (modbus) 2017-04-18 14:16:58 +08:00
root 88255a1ae2 new version addlink page 2017-04-18 10:25:44 +08:00
root 26f669fb96 update action link add page 2017-04-18 09:24:41 +08:00
root eb6b8d9ad5 update 2017-04-14 18:20:30 +08:00
root 12ff3a4020 new ver actionLink page 2017-04-14 18:09:20 +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 29a5543c44 add server api file 2017-04-13 13:23:08 +08:00
root e3a3307340 update 2017-04-13 13:14:08 +08:00
root efdc7e01c2 fix error 2017-04-13 13:13:40 +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 e5bf72435c add modbus preview page 2017-04-12 14:26:01 +08:00
root 87525f2597 Merge branch 'master' into release 2017-04-11 16:48:52 +08:00
root 64ad807310 add wristband path history info 2017-04-11 16:48:31 +08:00
root 0cdbd319c8 change menu item name 2017-04-11 09:40:34 +08:00
root b1ad20d86c Merge branch 'master' into release 2017-04-10 17:56:19 +08:00
root 6e0f6faa25 fix error 2017-04-10 17:56:08 +08:00
root 5c02a34897 update 2017-04-10 15:55:16 +08:00
root 59331f9b1c add locStatus with location 2017-04-10 15:40:40 +08:00
root 7a30f23138 add version file webio-v0.0.2 2017-04-10 10:05:25 +08:00
root 108e7db8f3 update 2017-04-10 10:03:43 +08:00
root 0fdcaf3bfc wristband first 2017-04-07 16:23:47 +08:00
root 2434db599d wristband first 2017-04-07 16:23:41 +08:00
root 05e38c2e2d update 2017-04-06 18:17:26 +08:00
root b8ccbe4cd3 update 2017-04-06 17:31:36 +08:00
root e18fa6546b add setting wristband 2017-04-06 16:28:57 +08:00
root b781efabea update 2017-04-05 17:54:23 +08:00
root c132be1ed0 add wristband sort 2017-04-05 16:45:58 +08:00
root 8d8b4818ae fix locale 404 not default 2017-04-05 15:36:29 +08:00
root 34f2d0e24a fix locale 404 not default 2017-04-05 15:35:32 +08:00
root b684672ad2 update 2017-04-05 15:10:02 +08:00
root 57a37b047f add timezone setting 2017-04-05 11:26:30 +08:00
root 7cfdf4f2af update 2017-03-31 18:10:37 +08:00
root e529794956 add mysql error send to frontend 2017-03-31 17:14:42 +08:00
root c1b443b9d2 update 2017-03-31 15:35:39 +08:00
root b419194b6b update 2017-03-31 15:35:30 +08:00
root f8f3cbe0d8 update wristband api and add wristband ui 2017-03-31 09:19:16 +08:00
root e1ce5290da update 2017-03-29 18:02:51 +08:00
root 3e66691b67 add modbus log 2017-03-29 15:06:50 +08:00
root 77bf5f58d2 fix mysql pool release and add wristband api 2017-03-28 16:34:50 +08:00
root eeead43baf update modbus db and view 2017-03-28 13:53:16 +08:00
root 52e18de9ac add page chk login 2017-03-27 18:11:27 +08:00
root e2040a181e add ipcam api 2017-03-27 18:00:21 +08:00
root 493dd36e18 change mysql connection to connection pool 2017-03-27 17:32:25 +08:00
root 404fb8c346 update 2017-03-27 16:27:35 +08:00
root 57c8083012 fix modbus api error 2017-03-27 16:26:58 +08:00
root 37d854334d add ipcam file 2017-03-27 14:53:34 +08:00
root 1df91aac09 change token expire time 2017-03-27 14:53:17 +08:00
root 7f93ea3bd6 add ipcam permission 2017-03-27 14:53:02 +08:00
root 40fa771e43 add iostatus name show 2017-03-27 13:18:31 +08:00
root c434a59910 fix modbus iolist bug 2017-03-27 11:31:58 +08:00