fe / yoho-blk · Commits

12 Jul, 2016

1 commit

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

11 Jul, 2016

19 commits

add hover stylesheet
50af1099

by jinhu.tung
2016-07-11 20:18:17 +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
invoice
444f701c

by xuqi
2016-07-11 16:23:13 +0800
Browse Files
support keep
ba8bcb4c

by xuqi
2016-07-11 16:20:34 +0800
Browse Files
send good to favorite
5b206730

by jinhu.tung
2016-07-11 15:49:28 +0800
Browse Files
remove product
f3944455

by jinhu.tung
2016-07-11 15:38:19 +0800
Browse Files
tooltip for good is not enough
070b44e8

by jinhu.tung
2016-07-11 14:32:08 +0800
Browse Files
rename shopping stylesheet file name
6137f4a3

by jinhu.tung
2016-07-11 13:51:41 +0800
Browse Files
shopping car modify good number
37891d9f

by jinhu.tung
2016-07-11 13:41:02 +0800
Browse Files
Merge branch 'develop' into feature/shopping ...
79185408
```
Conflicts:
	public/font/iconfont.svg
```
by xuqi
2016-07-11 10:10:01 +0800
Browse Files
merge
069033c8

by 姜枫
2016-07-11 09:53:09 +0800
Browse Files
完善check控件
f1aa671f

by 姜枫
2016-07-11 09:52:43 +0800
Browse Files
add manual for plugins
4ea47546

by jinhu.tung
2016-07-11 09:22:03 +0800
Browse Files
add getAreaLabels, getAreaIds, setAddress APIs
13f73641

by jinhu.tung
2016-07-11 09:07:44 +0800
Browse Files
Merge branch 'develop' of git.yoho.cn:fe/yoho-blk into develop
e5e2463f

by jinhu.tung
2016-07-11 09:05:40 +0800
Browse Files
handle merge
bcb00e1c

by 姜枫
2016-07-11 09:03:10 +0800
Browse Files
修改拼写错误
b713c11c

by 姜枫
2016-07-11 09:02:50 +0800
Browse Files

10 Jul, 2016

1 commit

add getAreaLabels, getAreaIds, setAddress APIs
b4902ecc

by jinhu.tung
2016-07-10 15:31:07 +0800
Browse Files

09 Jul, 2016

7 commits

品牌
90e13720

by zhangxiaoru
2016-07-09 18:06:40 +0800
Browse Files
品牌
3275a245

by zhangxiaoru
2016-07-09 18:03:39 +0800
Browse Files
品牌
02e1d928

by zhangxiaoru
2016-07-09 18:00:48 +0800
Browse Files
品牌
5b78bb7b

by zhangxiaoru
2016-07-09 17:59:51 +0800
Browse Files
Merge branch 'feature/my-order' into develop
d12adee7

by biao
2016-07-09 09:23:08 +0800
Browse Files
revert the config for dev
04ffcf1d

by biao
2016-07-09 09:22:50 +0800
Browse Files
Merge branch 'develop' into feature/my-order
3cb2006d

by biao
2016-07-09 09:16:04 +0800
Browse Files

08 Jul, 2016

12 commits

Merge branch 'feature/me' into develop ...
dd72ecb0
```
# Conflicts:
#	apps/editorial/models/editorial.js
#	apps/editorial/router.js
```
by 姜敏
2016-07-08 18:56:47 +0800
Browse Files
个人中心-收货地址大部分完结
a8570d7c

by 姜敏
2016-07-08 18:52:41 +0800
Browse Files
coin cancel
550a4b4e

by xuqi
2016-07-08 18:07:39 +0800
Browse Files
Merge branch 'feature/my-order' into develop
0f5826eb

by biao
2016-07-08 17:19:31 +0800
Browse Files
update for pagination
e439ecbf

by biao
2016-07-08 17:18:52 +0800
Browse Files
code norm remend
5f301e59

by xuqi
2016-07-08 17:12:46 +0800
Browse Files
yoho coin logic
98c481b2

by xuqi
2016-07-08 16:59:05 +0800
Browse Files
添加商铺列表页
ab30b479

by 姜枫
2016-07-08 16:29:21 +0800
Browse Files
资讯
b711ad9b

by zhangxiaoru
2016-07-08 16:29:11 +0800
Browse Files
资讯
7351ecb7

by zhangxiaoru
2016-07-08 16:28:50 +0800
Browse Files
添加商铺列表页
0032cfad

by 姜枫
2016-07-08 16:28:16 +0800
Browse Files
添加商铺列表页
0dcf02f9

by 姜枫
2016-07-08 16:28:02 +0800
Browse Files