fe / yoho-blk · Commits

25 Jul, 2016

29 commits

Merge remote-tracking branch 'origin/release/1.0' into release/1.0 ...
3f04d614
```
# Conflicts:
#	config/common.js
```
by htoooth
2016-07-25 15:24:42 +0800
Browse Files
修复重复绑定的问题。
3a828c06

by htoooth
2016-07-25 15:23:05 +0800
Browse Files
api: http://testapi.yoho.cn:28078/, // devapi.yoho.cn:58078 testapi.yoho.cn:2807… ...
56bab103
```
…8 devapi.yoho.cn:58078
```
by 姜枫
2016-07-25 15:13:08 +0800
Browse Files
fix bug 225
2aaa452f

by 姜枫
2016-07-25 15:12:35 +0800
Browse Files
change css
9bacd16e

by htoooth
2016-07-25 15:05:18 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
92e717a6

by jinhu.tung
2016-07-25 14:37:05 +0800
Browse Files
remove products at least one
dcbdcadf

by jinhu.tung
2016-07-25 14:36:53 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
6216c625

by xuqi
2016-07-25 14:31:04 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
7900ce5d

by jinhu.tung
2016-07-25 14:30:44 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
25f52749

by jinhu.tung
2016-07-25 14:30:00 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
52ef8af8

by xuqi
2016-07-25 14:29:50 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
7fb3b638

by xuqi
2016-07-25 14:24:01 +0800
Browse Files
add comments
2bfbf3ad

by xuqi
2016-07-25 14:23:44 +0800
Browse Files
add code comment
e9cfff32

by 姜枫
2016-07-25 14:22:47 +0800
Browse Files
add code comment
b22392c6

by 姜枫
2016-07-25 14:22:41 +0800
Browse Files
invalid product sales_price
6463d60b

by jinhu.tung
2016-07-25 14:13:20 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
694fa4db

by 姜敏
2016-07-25 14:09:50 +0800
Browse Files
完善注释
97787553

by 姜敏
2016-07-25 14:08:46 +0800
Browse Files
完善注释
f9a8b3a2

by 姜敏
2016-07-25 14:08:24 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
5c852073

by xuqi
2016-07-25 13:28:05 +0800
Browse Files
shipping cut show
a523e48a

by xuqi
2016-07-25 13:27:28 +0800
Browse Files
send to favorite alert and storage info color
7ce43d40

by jinhu.tung
2016-07-25 13:12:22 +0800
Browse Files
handle merge
e454b065

by 姜枫
2016-07-25 12:01:56 +0800
Browse Files
add pay tips dialog
1da08464

by 姜枫
2016-07-25 12:01:38 +0800
Browse Files
send to favorite at least one
f0e99424

by jinhu.tung
2016-07-25 11:40:23 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
012c34ef

by jinhu.tung
2016-07-25 11:28:18 +0800
Browse Files
remove invalid goods and send to favorite
8950e95e

by jinhu.tung
2016-07-25 11:26:10 +0800
Browse Files
invalid product can not interaction
47d5096f

by jinhu.tung
2016-07-25 10:49:10 +0800
Browse Files
modify invalid style
afd39ffd

by jinhu.tung
2016-07-25 10:36:55 +0800
Browse Files

23 Jul, 2016

11 commits

add route auth
290e80b7

by 姜枫
2016-07-23 17:04:58 +0800
Browse Files
editorial
f9b8d4a2

by zhangxiaoru
2016-07-23 17:00:04 +0800
Browse Files
editorial
7efc6cf9

by zhangxiaoru
2016-07-23 16:55:45 +0800
Browse Files
editorial
5961ab77

by zhangxiaoru
2016-07-23 16:53:10 +0800
Browse Files
editorial
0b57894a

by zhangxiaoru
2016-07-23 16:47:03 +0800
Browse Files
editorial
7a0692d9

by zhangxiaoru
2016-07-23 16:37:23 +0800
Browse Files
editorial
263db0a8

by zhangxiaoru
2016-07-23 16:35:21 +0800
Browse Files
editorial
5913d545

by zhangxiaoru
2016-07-23 16:32:06 +0800
Browse Files
handle merge
eb8f573e

by 姜枫
2016-07-23 16:30:55 +0800
Browse Files
add alipay pay back
26292983

by 姜枫
2016-07-23 16:30:09 +0800
Browse Files
add alipay pay back
a480f591

by 姜枫
2016-07-23 16:30:00 +0800
Browse Files