fe / yoho-blk · Commits

06 Aug, 2016

3 commits

Merge remote-tracking branch 'origin/release/1.0' into release/1.0
ec80e9df

by htoooth
2016-08-06 13:23:01 +0800
Browse Files
设置格式
96770e17

by htoooth
2016-08-06 13:20:44 +0800
Browse Files
404和500加http_code
1c5d0dab

by 周奇琪
2016-08-06 11:02:49 +0800
Browse Files

05 Aug, 2016

37 commits

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

by xuqi
2016-08-05 19:17:13 +0800
Browse Files
reset left num
6c0aa44a

by xuqi
2016-08-05 19:16:56 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
061b5939

by yyq
2016-08-05 19:14:17 +0800
Browse Files
地址样式调整
513644b1

by yyq
2016-08-05 19:14:00 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
d598f664

by biao
2016-08-05 19:00:26 +0800
Browse Files
update for highlight check detail
28bb1dee

by biao
2016-08-05 19:00:11 +0800
Browse Files
editorial
93a02fd4

by zhangxiaoru
2016-08-05 18:55:55 +0800
Browse Files
editorial
62f8955b

by zhangxiaoru
2016-08-05 18:55:25 +0800
Browse Files
editorial
8a95f3f8

by zhangxiaoru
2016-08-05 18:54:55 +0800
Browse Files
err params
61490480

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

by xuqi
2016-08-05 18:44:28 +0800
Browse Files
product info
0c7484b0

by xuqi
2016-08-05 18:44:11 +0800
Browse Files
update img size
6b311ce1

by biao
2016-08-05 18:36:32 +0800
Browse Files
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