fe / yoho-blk · Commits

05 Aug, 2016

40 commits

Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
76958cb5

by biao
2016-08-05 18:30:54 +0800
Browse Files
update for text limit
ebf3e63b

by biao
2016-08-05 18:30:37 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
698af315

by yyq
2016-08-05 18:22:59 +0800
Browse Files
return top
5425a2fd

by yyq
2016-08-05 18:22:25 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
ba2a842e

by biao
2016-08-05 18:21:31 +0800
Browse Files
update for edit btn
77867eec

by biao
2016-08-05 18:21:19 +0800
Browse Files
handle merge
c8fc02a4

by 姜枫
2016-08-05 18:20:32 +0800
Browse Files
fix bug
a8a64eee

by 姜枫
2016-08-05 18:20:10 +0800
Browse Files
dot name
c2b3821c

by xuqi
2016-08-05 18:15:15 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
18f6e29a

by xuqi
2016-08-05 18:05:27 +0800
Browse Files
set editable
9239c180

by xuqi
2016-08-05 18:05:11 +0800
Browse Files
handle merge
ee9a90d3

by 姜枫
2016-08-05 17:53:40 +0800
Browse Files
fix bugs
8a855008

by 姜枫
2016-08-05 17:53:04 +0800
Browse Files
reset storage
c6aa53e6

by xuqi
2016-08-05 17:47:17 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0 ...
c9753cb1
```
Conflicts:
	apps/shopping/helpers/index.js
	public/helper/showStorage.js
```
by xuqi
2016-08-05 17:42:35 +0800
Browse Files
storage
471d25b4

by xuqi
2016-08-05 17:41:11 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
560cfc40

by yyq
2016-08-05 17:27:13 +0800
Browse Files
ie8购物车不跳转问题
b977d9c1

by yyq
2016-08-05 17:26:44 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
2e3d95ed

by biao
2016-08-05 17:22:39 +0800
Browse Files
update for channel floor data process and browser compatibility
d845da73

by biao
2016-08-05 17:22:28 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
943c24f6

by yyq
2016-08-05 17:10:49 +0800
Browse Files
购物车兼容性
73c3f615

by yyq
2016-08-05 17:09:09 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
7550aea9

by xuqi
2016-08-05 16:24:33 +0800
Browse Files
error typing
c0db4c2c

by xuqi
2016-08-05 16:24:17 +0800
Browse Files
header容错
98c0abab

by yyq
2016-08-05 16:15:09 +0800
Browse Files
remove what is yoho coin
3cb62f43

by xuqi
2016-08-05 16:10:55 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
c7683992

by xuqi
2016-08-05 16:03:57 +0800
Browse Files
cart goods
0810c67a

by xuqi
2016-08-05 16:03:27 +0800
Browse Files
支付成功页render替换
3752d902

by yyq
2016-08-05 15:54:33 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
161a80ff

by yyq
2016-08-05 15:48:55 +0800
Browse Files
商品详情Safari兼容性问题修正
5611428b

by yyq
2016-08-05 15:48:43 +0800
Browse Files
due to date show of cart
0c051c82

by xuqi
2016-08-05 15:45:45 +0800
Browse Files
returns link
b8b15eb1

by xuqi
2016-08-05 15:42:52 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
1f322ac0

by xuqi
2016-08-05 15:31:28 +0800
Browse Files
remove to favorite when un logined
df880299

by xuqi
2016-08-05 15:31:00 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
63f817d3

by yyq
2016-08-05 15:23:12 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
fa847665

by xuqi
2016-08-05 15:22:15 +0800
Browse Files
兼容性问题处理
5bc381de

by yyq
2016-08-05 15:21:47 +0800
Browse Files
error typing
09358a45

by xuqi
2016-08-05 15:19:48 +0800
Browse Files
cart header
0397b88f

by xuqi
2016-08-05 14:48:47 +0800
Browse Files