Commit Graph

120 Commits

Author SHA1 Message Date
ScorpioMiku
ed323d4cc1 server 2019-09-07 10:43:01 +08:00
ScorpioMiku
8a2fbe426f Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-09-06 21:22:11 +08:00
ScorpioMiku
5184cd4ee6 inter server 2019-09-06 21:22:03 +08:00
ScorpioMiku
13717715de 1 2019-09-06 17:46:15 +08:00
jiangyuwei666
4a431eb734 Update README.md 2019-09-06 14:12:35 +08:00
jiangyuwei666
9b1d20ca28 add location 2019-09-06 14:07:56 +08:00
ScorpioMiku
ae2145a114 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-09-06 11:05:36 +08:00
ScorpioMiku
9b27ed2b17 app ok 2019-09-06 11:05:13 +08:00
LitterDryFish
5537292f0d zigbee 2019-09-06 08:29:58 +08:00
LitterDryFish
4454229072 zigbee 2019-09-06 08:29:10 +08:00
jiangyuwei666
e54dcab5e4 Update README.md 2019-09-05 14:49:16 +08:00
jiangyuwei666
f66a4fb3f9 readme 2019-09-05 14:46:10 +08:00
ScorpioMiku
8b4316d056 child step 2019-09-05 13:44:42 +08:00
jiangyuwei666
73d3c2d091 change table 2019-09-04 21:36:58 +08:00
ScorpioMiku
5edb8f3ed8 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-09-04 20:49:44 +08:00
ScorpioMiku
8eba4cf34f child login 2019-09-04 20:46:15 +08:00
JiangYuWei
6a90ae61ac Update README.md 2019-09-04 20:24:12 +08:00
vickihe
671d8b3a00 style finished 2019-09-04 19:56:12 +08:00
ScorpioMiku
b22d5ad1aa 15:16 2019-09-04 15:16:38 +08:00
ScorpioMiku
dff6a52863 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-09-04 13:31:52 +08:00
ScorpioMiku
53f545f5aa temperature 2019-09-04 13:31:25 +08:00
jiangyuwei666
addbc19859 update README.md 2019-09-04 10:09:09 +08:00
jiangyuwei666
518154e940 add new column 2019-09-04 10:07:51 +08:00
ScorpioMiku
9dd69d81ac Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-09-04 09:43:06 +08:00
ScorpioMiku
77d8e36d4d step up 2019-09-04 09:41:21 +08:00
ScorpioMiku
9311cf9e85 map 2019-09-04 08:24:11 +08:00
vickihe
f82a37fec2 update 2019-09-03 22:13:54 +08:00
ScorpioMiku
1736ec5a43 location 2019-09-03 20:15:58 +08:00
ScorpioMiku
d45da0479d Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-09-03 19:08:12 +08:00
ScorpioMiku
27b89b2b5d WIFITrick 2019-09-03 19:07:51 +08:00
vickihe
d7a0932140 update 2019-09-03 15:43:08 +08:00
vickihe
2c18a68a80 update 2019-09-02 21:22:43 +08:00
vickihe
906e9814e5 update 2019-09-02 17:53:39 +08:00
vickihe
39cf6d119d update 2019-09-02 17:51:16 +08:00
vickihe
97a950f915 update 2019-08-30 21:24:14 +08:00
jiangyuwei666
fa5abe89f2 upadae README.md 2019-08-30 15:28:51 +08:00
jiangyuwei666
cc35d95111 add login 2019-08-30 14:19:03 +08:00
jiangyuwei666
f273901038 add admin service 2019-08-30 12:10:59 +08:00
vickihe
0aa41b8795 update 2019-08-29 20:26:26 +08:00
ScorpioMiku
b4fcde96e3 rate 2019-08-29 10:31:58 +08:00
ScorpioMiku
ce3514a928 rate 2019-08-29 10:31:32 +08:00
ScorpioMiku
5934dc9233 heart rate 2019-08-29 10:16:13 +08:00
ScorpioMiku
9f649b4f33 Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-29 09:37:56 +08:00
ScorpioMiku
61e28d2613 heartrate 2019-08-29 09:37:49 +08:00
vickihe
2a8b87b76b update 2019-08-28 21:54:29 +08:00
ScorpioMiku
dd3946829d Merge branch 'master' of https://github.com/wangtianrui/OldPeopleHome 2019-08-28 16:51:57 +08:00
ScorpioMiku
4fcc41e7b6 step 2019-08-28 16:51:45 +08:00
jiangyuwei666
203489b72f add column 2019-08-27 21:28:36 +08:00
vickihe
1a923fafe8 update 2019-08-27 19:54:52 +08:00
JiangYuWei
4410650225 Update README.md 2019-08-27 17:12:20 +08:00