fe / yoho-blk · Commits

13 Jul, 2016

9 commits

recevice update when focused address update
026da1d4

by xuqi
2016-07-13 14:43:38 +0800
Browse Files
init address dialog do not show cancel
3035fad6

by xuqi
2016-07-13 14:43:04 +0800
Browse Files
Merge remote-tracking branch 'origin/develop' into feature/shopping ...
7a31c427
```
Conflicts:
	public/font/iconfont.eot
	public/font/iconfont.svg
	public/font/iconfont.ttf
	public/font/iconfont.woff
```
by xuqi
2016-07-13 13:56:09 +0800
Browse Files
Merge branch 'feature/shopping' of http://git.yoho.cn/fe/yoho-blk into feature/shopping
2ab4e190

by xuqi
2016-07-13 13:46:38 +0800
Browse Files
binding page data
f7d375b9

by xuqi
2016-07-13 13:46:01 +0800
Browse Files
refactor setAddress api
f3b04666

by jinhu.tung
2016-07-13 11:28:20 +0800
Browse Files
图标添加
e5258c8d

by zhangxiaoru
2016-07-13 11:18:51 +0800
Browse Files
图标
0437dee2

by zhangxiaoru
2016-07-13 10:59:24 +0800
Browse Files
add addToCart, getCartData, transferToFavorite API
33b94ecc

by jinhu.tung
2016-07-13 10:45:29 +0800
Browse Files

12 Jul, 2016

22 commits

address with areacode
6fff82aa

by xuqi
2016-07-12 20:42:13 +0800
Browse Files
address operation
80084f4f

by xuqi
2016-07-12 20:11:52 +0800
Browse Files
add addToCart API
920b361a

by jinhu.tung
2016-07-12 20:09:23 +0800
Browse Files
brand
d70e05a6

by zhangxiaoru
2016-07-12 17:27:20 +0800
Browse Files
brand
481440d4

by zhangxiaoru
2016-07-12 17:25:33 +0800
Browse Files
init edit cart product
ea9b9316

by jinhu.tung
2016-07-12 16:40:37 +0800
Browse Files
Merge branch 'feature/shopping' of git.yoho.cn:fe/yoho-blk into feature/shopping
c2a66e29

by jinhu.tung
2016-07-12 16:35:50 +0800
Browse Files
address dialogs for order
295a2e6b

by xuqi
2016-07-12 15:19:26 +0800
Browse Files
brands
fdf49b67

by zhangxiaoru
2016-07-12 15:07:27 +0800
Browse Files
brands
32185aad

by zhangxiaoru
2016-07-12 15:07:11 +0800
Browse Files
品牌
e0452da9

by zhangxiaoru
2016-07-12 15:01:33 +0800
Browse Files
品牌
06c2e034

by zhangxiaoru
2016-07-12 14:59:59 +0800
Browse Files
brand node
f1169daf

by zhangxiaoru
2016-07-12 13:15:40 +0800
Browse Files
brand node
3a200297

by zhangxiaoru
2016-07-12 13:13:52 +0800
Browse Files
brand node
9f50b162

by zhangxiaoru
2016-07-12 13:13:17 +0800
Browse Files
Merge branch 'develop' into feature/shopping
b1080f90

by xuqi
2016-07-12 09:42:04 +0800
Browse Files
Merge branch 'feature/shopping' of git.yoho.cn:fe/yoho-blk into feature/shopping
f4d99a57

by jinhu.tung
2016-07-12 09:25:47 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/fe/yoho-blk into develop
ced9fb24

by biao
2016-07-12 09:25:35 +0800
Browse Files
Merge branch 'feature/my-order' into develop
7a50709e

by biao
2016-07-12 09:25:19 +0800
Browse Files
update for badge
3781e0a9

by biao
2016-07-12 09:24:39 +0800
Browse Files
handle merge
ed5042cb

by 姜枫
2016-07-12 09:12:34 +0800
Browse Files
处理鼠标cursor 形状
2e989b1c

by 姜枫
2016-07-12 09:12:17 +0800
Browse Files

11 Jul, 2016

9 commits

add hover stylesheet
50af1099

by jinhu.tung
2016-07-11 20:18:17 +0800
Browse Files
cursor on new address
bbc7dbfa

by xuqi
2016-07-11 19:48:35 +0800
Browse Files
reset address
13b83055

by jinhu.tung
2016-07-11 19:42:38 +0800
Browse Files
reset address
d3b29d1d

by jinhu.tung
2016-07-11 19:42:00 +0800
Browse Files
address spread
525f8e7f

by xuqi
2016-07-11 19:02:25 +0800
Browse Files
leaks codes
d45b037c

by xuqi
2016-07-11 18:29:30 +0800
Browse Files
Merge branch 'feature/shopping' of http://git.yoho.cn/fe/yoho-blk into feature/shopping ...
0d0550d1
```
Conflicts:
	apps/shopping/controllers/order.js
	apps/shopping/views/action/order.hbs
```
by xuqi
2016-07-11 18:23:21 +0800
Browse Files
fix reqire error
87bed037

by 姜枫
2016-07-11 17:31:39 +0800
Browse Files
handle merge
ac125f82

by 姜枫
2016-07-11 17:29:40 +0800
Browse Files