179 Commits

Author SHA1 Message Date
ScorpioMiku
e5c27211bc 1 2018-10-10 20:34:32 +08:00
ScorpioMiku
b562d35d82 1 2018-10-08 21:59:23 +08:00
ScorpioMiku
a409c2a010 1 2018-10-08 21:56:50 +08:00
ScorpioMiku
9b2f4df365 1 2018-10-08 21:02:00 +08:00
ScorpioMiku
8fbf311d1d 1 2018-10-08 17:05:05 +08:00
ScorpioMiku
e84c182cd5 1 2018-10-08 16:17:05 +08:00
ScorpioMiku
b308f27154 1 2018-10-07 22:25:13 +08:00
ScorpioMiku
fadd2ba1a6 1 2018-10-07 22:24:59 +08:00
ScorpioMiku
7e1c9aa755 1 2018-10-07 20:10:39 +08:00
ScorpioMiku
c628931e62 1 2018-10-07 19:11:36 +08:00
ScorpioMiku
4fd0da3f4c 1 2018-10-07 17:47:49 +08:00
ScorpioMiku
2f2e143494 Merge branch 'develop' of https://github.com/wangtianrui/NutritionMaster into develop 2018-10-07 17:40:49 +08:00
ScorpioMiku
3959bac0b2 1 2018-10-07 17:40:38 +08:00
ScorpioMiku
cdf699a8d5 1 2018-10-07 17:21:33 +08:00
ScorpioMiku
d98235fb0a 联网 2018-10-07 17:20:43 +08:00
zhaolizhi
6025ec37e4 add is_breakfast field 2018-10-07 17:14:58 +08:00
zhaolizhi
3c83a4bfa5 eatenElements 2018-10-07 16:31:35 +08:00
zhaolizhi
b72fcf0732 eaten elements 2018-10-07 16:20:51 +08:00
ScorpioMiku
e424d14565 1 2018-10-07 14:08:14 +08:00
ScorpioMiku
74e6d23cd6 1 2018-10-07 12:53:06 +08:00
ScorpioMiku
9858485c47 小细节 2018-10-06 21:58:07 +08:00
ScorpioMiku
4d979725cb 1 2018-10-06 21:44:44 +08:00
ScorpioMiku
1817d66cc5 single classify 2018-10-06 17:55:42 +08:00
ScorpioMiku
dd780cdb72 1 2018-10-06 16:38:36 +08:00
ScorpioMiku
73cb1db3d8 Merge branch 'develop' into wangtianrui 2018-10-06 14:33:59 +08:00
ScorpioMiku
1752f13d61 1 2018-10-06 14:31:59 +08:00
ScorpioMiku
dafcf5583e 1 2018-10-06 14:11:03 +08:00
zhaolizhi
861d76d4cc webutil 2018-10-06 13:27:09 +08:00
zhaolizhi
1ea891f765 webutil 2018-10-06 13:20:26 +08:00
ScorpioMiku
164beaef04 1 2018-10-05 21:02:47 +08:00
ScorpioMiku
ccd3e0633c 1 2018-10-05 19:10:54 +08:00
ScorpioMiku
c49044a0f6 merge的bug改完了 2018-10-05 16:03:01 +08:00
ScorpioMiku
6c6ae71d64 Merge branch 'wangtianrui' into develop 2018-10-05 15:32:56 +08:00
ScorpioMiku
9aa0625e67 1 2018-10-05 15:27:29 +08:00
ScorpioMiku
5db14fcf04 result 2018-10-05 14:25:49 +08:00
ScorpioMiku
92f4b56f64 1 2018-10-05 12:31:44 +08:00
ScorpioMiku
9762633ecd dish 识别 2018-10-04 20:03:10 +08:00
ScorpioMiku
1b3ac3c501 access 2018-10-04 15:25:27 +08:00
zhaolizhi
80869c4c7f util 2018-10-02 21:03:36 +08:00
zhaolizhi
45030adc91 utils 2018-10-02 21:00:08 +08:00
ScorpioMiku
1612b9f7ea Merge branch 'wangtianrui' into develop 2018-10-02 17:15:47 +08:00
ScorpioMiku
886cb247af 1 2018-10-02 16:51:39 +08:00
ScorpioMiku
fb4654e24a 体质测试UI bug改好了 2018-10-02 16:45:41 +08:00
ScorpioMiku
47aea25966 1 2018-10-02 15:57:44 +08:00
ScorpioMiku
83406a8e0b 1 2018-10-02 15:41:12 +08:00
ScorpioMiku
b1fd6bbdd9 改了myuser physique 2018-10-02 14:43:03 +08:00
ScorpioMiku
6293416764 体质测评 2018-10-02 14:31:29 +08:00
ScorpioMiku
fd225f4da2 体质测评完成 2018-10-02 11:43:48 +08:00
ScorpioMiku
7c4bbb2f27 information bar 2018-10-01 16:20:51 +08:00
ScorpioMiku
e8a1ef4066 information bar 2018-10-01 16:19:24 +08:00