Commit Graph

71 Commits

Author SHA1 Message Date
Jay
9b70a544df Merge branch 'master' into release 2017-04-20 09:34:25 +08:00
Jay
2d958f2d85 update 2017-04-20 09:30:44 +08:00
Jay
a92d29e107 update 2017-04-20 09:29:16 +08:00
Jay
85cb31b013 delete old add link page 2017-04-18 15:11:24 +08:00
Jay
b849574ee1 edit config.json to webio version 2017-04-18 14:37:22 +08:00
Jay
5429ffbb73 make version webio-v0.0.3 2017-04-18 14:28:41 +08:00
Jay
a4ac4742be Merge branch 'master' into release 2017-04-18 14:27:56 +08:00
Jay
1a0a4fdc4d addlink new func (modbus) 2017-04-18 14:16:58 +08:00
Jay
88255a1ae2 new version addlink page 2017-04-18 10:25:44 +08:00
Jay
26f669fb96 update action link add page 2017-04-18 09:24:41 +08:00
Jay
eb6b8d9ad5 update 2017-04-14 18:20:30 +08:00
Jay
12ff3a4020 new ver actionLink page 2017-04-14 18:09:20 +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
afd3994e95 update webio-v0.0.2 2017-04-13 13:28:08 +08:00
Jay
d504f26bda Merge branch 'master' into release 2017-04-13 13:24:25 +08:00
Jay
29a5543c44 add server api file 2017-04-13 13:23:08 +08:00
Jay
e3a3307340 update 2017-04-13 13:14:08 +08:00
Jay
efdc7e01c2 fix error 2017-04-13 13:13:40 +08:00
Jay
91effa014a new version wristband-v0.0.1 2017-04-12 14:36:16 +08:00
Jay
0ea24f857d Merge branch 'master' into release 2017-04-12 14:32:51 +08:00
Jay
e5bf72435c add modbus preview page 2017-04-12 14:26:01 +08:00
Jay
87525f2597 Merge branch 'master' into release 2017-04-11 16:48:52 +08:00
Jay
64ad807310 add wristband path history info 2017-04-11 16:48:31 +08:00
Jay
0cdbd319c8 change menu item name 2017-04-11 09:40:34 +08:00
Jay
b1ad20d86c Merge branch 'master' into release 2017-04-10 17:56:19 +08:00
Jay
6e0f6faa25 fix error 2017-04-10 17:56:08 +08:00
Jay
5c02a34897 update 2017-04-10 15:55:16 +08:00
Jay
59331f9b1c add locStatus with location 2017-04-10 15:40:40 +08:00
Jay
7a30f23138 add version file webio-v0.0.2 2017-04-10 10:05:25 +08:00
Jay
108e7db8f3 update 2017-04-10 10:03:43 +08:00
Jay
0fdcaf3bfc wristband first 2017-04-07 16:23:47 +08:00
Jay
2434db599d wristband first 2017-04-07 16:23:41 +08:00
Jay
05e38c2e2d update 2017-04-06 18:17:26 +08:00
Jay
b8ccbe4cd3 update 2017-04-06 17:31:36 +08:00
Jay
e18fa6546b add setting wristband 2017-04-06 16:28:57 +08:00
Jay
b781efabea update 2017-04-05 17:54:23 +08:00
Jay
c132be1ed0 add wristband sort 2017-04-05 16:45:58 +08:00
Jay
8d8b4818ae fix locale 404 not default 2017-04-05 15:36:29 +08:00
Jay
34f2d0e24a fix locale 404 not default 2017-04-05 15:35:32 +08:00
Jay
b684672ad2 update 2017-04-05 15:10:02 +08:00
Jay
57a37b047f add timezone setting 2017-04-05 11:26:30 +08:00
Jay
7cfdf4f2af update 2017-03-31 18:10:37 +08:00
Jay
e529794956 add mysql error send to frontend 2017-03-31 17:14:42 +08:00
Jay
c1b443b9d2 update 2017-03-31 15:35:39 +08:00
Jay
b419194b6b update 2017-03-31 15:35:30 +08:00
Jay
f8f3cbe0d8 update wristband api and add wristband ui 2017-03-31 09:19:16 +08:00
Jay
e1ce5290da update 2017-03-29 18:02:51 +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