fe / yohobuy-node · Commits

24 Nov, 2016

12 commits

Merge branch 'release/5.2' of git.yoho.cn:fe/yohobuy-node into release/5.2
3bed117b

by yyq
2016-11-24 16:00:59 +0800
Browse Files
修改
212690cc

by hongweigao
2016-11-24 16:00:18 +0800
Browse Files
限定商品订单提交发票
fe1eebeb

by yyq
2016-11-24 15:59:59 +0800
Browse Files
修改新人专享cookie取值
896902d1

by hongweigao
2016-11-24 15:53:55 +0800
Browse Files
Merge branch 'release/5.2' of http://git.yoho.cn/fe/yohobuy-node into release/5.2
5b05d5db

by hongweigao
2016-11-24 15:25:48 +0800
Browse Files
修改新人专享cashe
10d0277f

by hongweigao
2016-11-24 15:25:37 +0800
Browse Files
发票类型选择
e08f96a7

by yyq
2016-11-24 15:07:45 +0800
Browse Files
fix bug
e0590846

by htoooth
2016-11-24 14:45:53 +0800
Browse Files
removde bug
97becc00

by htoooth
2016-11-24 14:19:41 +0800
Browse Files
add status
98333c7a

by htoooth
2016-11-24 11:55:02 +0800
Browse Files
fix css
d5e2e236

by htoooth
2016-11-24 11:37:53 +0800
Browse Files
fix login
5b745da9

by htoooth
2016-11-24 11:00:28 +0800
Browse Files

23 Nov, 2016

15 commits

fix recommend bug
e62bd484

by htoooth
2016-11-23 20:23:12 +0800
Browse Files
update lib
1a4f6aa0

by htoooth
2016-11-23 17:37:19 +0800
Browse Files
Merge branch 'master' into release/5.2 ...
c0dd1db6
```
# Conflicts:
#	apps/product/models/shop-handler.js
```
by htoooth
2016-11-23 17:32:52 +0800
Browse Files
删除埋点打印
4b9817c5

by hongweigao
2016-11-23 17:15:43 +0800
Browse Files
fix
f82ad9c1

by htoooth
2016-11-23 16:51:46 +0800
Browse Files
add fix
58efdea9

by htoooth
2016-11-23 15:04:45 +0800
Browse Files
Merge remote-tracking branch 'origin/release/5.2' into release/5.2
bb29e631

by htoooth
2016-11-23 14:19:09 +0800
Browse Files
fix bug
47cd59e1

by htoooth
2016-11-23 14:18:52 +0800
Browse Files
Merge branch 'feature/brandShopSEO' into release/5.2
011818f5

by yyq
2016-11-23 12:58:26 +0800
Browse Files
Merge branch 'hotfix/shopDecorator'
12d919b1

by 周少峰
2016-11-23 12:46:03 +0800
Browse Files
base shop sort add shopId
917a88fe

by yyq
2016-11-23 12:41:33 +0800
Browse Files
Merge branch 'hotfix/searchBrandSort'
2e557267

by 周少峰
2016-11-23 10:54:27 +0800
Browse Files
search brand sort bug
0740a7f9

by 刘传洋
2016-11-23 10:47:49 +0800
Browse Files
Merge branch 'hotfix/shopDecorator'
67cfd05d

by 周少峰
2016-11-23 10:33:28 +0800
Browse Files
shop decorator
fd343467

by yyq
2016-11-23 10:17:03 +0800
Browse Files

22 Nov, 2016

11 commits

fix bug
e545800c

by htoooth
2016-11-22 20:54:25 +0800
Browse Files
fix bug
8336ea93

by htoooth
2016-11-22 20:48:54 +0800
Browse Files
fix
274cea16

by htoooth
2016-11-22 19:53:20 +0800
Browse Files
fix bug
8a36ee9c

by htoooth
2016-11-22 19:39:44 +0800
Browse Files
Merge branch 'feature/fav-brand' into release/5.2
b4c6b45b

by htoooth
2016-11-22 19:17:38 +0800
Browse Files
Merge branch 'feature/recommend' into release/5.2 ...
6b226f49
```
# Conflicts:
#	public/js/product/detail.page.js
```
by htoooth
2016-11-22 18:19:22 +0800
Browse Files
推荐
076625a3

by OF1706
2016-11-22 18:13:41 +0800
Browse Files
remove some case
41cf75f6

by htoooth
2016-11-22 11:52:13 +0800
Browse Files
add alert
c73c69d0

by htoooth
2016-11-22 11:08:06 +0800
Browse Files
update page
70e812ee

by htoooth
2016-11-22 11:04:57 +0800
Browse Files
推荐需求循环轮播
eb973232

by OF1706
2016-11-22 10:45:43 +0800
Browse Files

21 Nov, 2016

2 commits

handle in fail
b5852330

by 周少峰
2016-11-21 20:10:59 +0800
Browse Files
alert api error message
f2436adf

by 周少峰
2016-11-21 19:56:17 +0800
Browse Files