fe / yoho-blk · Commits

29 Jul, 2016

30 commits

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

by xuqi
2016-07-29 11:11:43 +0800
Browse Files
input trigger in ie8
7df9bb9c

by xuqi
2016-07-29 11:07:08 +0800
Browse Files
handle merge
9cc176de

by 姜枫
2016-07-29 11:04:13 +0800
Browse Files
add js hbs
4070dcbc

by 姜枫
2016-07-29 11:03:52 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
18608acb

by biao
2016-07-29 10:52:15 +0800
Browse Files
editorial
3e56af3e

by zhangxiaoru
2016-07-29 10:52:33 +0800
Browse Files
update for remove comment
390cd8ea

by biao
2016-07-29 10:52:02 +0800
Browse Files
editorial
1cb4c8a3

by zhangxiaoru
2016-07-29 10:51:58 +0800
Browse Files
editorial
26dfa966

by zhangxiaoru
2016-07-29 10:50:36 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
5d1d0d05

by yyq
2016-07-29 10:46:42 +0800
Browse Files
exchange
959e59b0

by zhangxiaoru
2016-07-29 10:46:36 +0800
Browse Files
exchange
e270e6cc

by zhangxiaoru
2016-07-29 10:44:02 +0800
Browse Files
handle merge
4e9514fc

by 姜枫
2016-07-29 10:43:45 +0800
Browse Files
handle merge
5c76a20f

by 姜枫
2016-07-29 10:43:18 +0800
Browse Files
商品名称限制两行
c63d49f8

by yyq
2016-07-29 10:42:33 +0800
Browse Files
fix shop index
85996288

by 姜枫
2016-07-29 10:41:50 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
f8ccadaa

by biao
2016-07-29 10:40:06 +0800
Browse Files
update for change type
3a51459a

by biao
2016-07-29 10:39:54 +0800
Browse Files
placeholder for order
28faa57c

by xuqi
2016-07-29 10:39:08 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
e6f52211

by xuqi
2016-07-29 10:26:31 +0800
Browse Files
上传图片统计错误
8f8bef35

by yyq
2016-07-29 10:16:31 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
d43883d1

by yyq
2016-07-29 10:07:09 +0800
Browse Files
帮助中心跳转
f5e57820

by yyq
2016-07-29 10:06:46 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
33dc7926

by htoooth
2016-07-29 09:59:31 +0800
Browse Files
增加end
7fa8e070

by htoooth
2016-07-29 09:59:14 +0800
Browse Files
update for text length limit
d343fc8d

by biao
2016-07-29 09:38:56 +0800
Browse Files
update for the error msg
79e14261

by biao
2016-07-29 09:16:29 +0800
Browse Files
update for the error msg
954c24f9

by biao
2016-07-29 09:14:10 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
bf7a5b05

by biao
2016-07-29 09:13:54 +0800
Browse Files
update for the error msg
7059301c

by biao
2016-07-29 09:13:45 +0800
Browse Files

28 Jul, 2016

10 commits

帮助中心面包屑修复
14e7bc06

by 姜敏
2016-07-28 19:21:36 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
150b2c38

by xuqi
2016-07-28 18:17:46 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
b7ae819d

by 姜敏
2016-07-28 18:17:00 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0 ...
6efcabc6
```
# Conflicts:
#	apps/help/controllers/help.js
#	public/js/help/help.page.js
```
by 姜敏
2016-07-28 18:16:49 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
c04813e4

by biao
2016-07-28 18:15:01 +0800
Browse Files
update for optimise code
a32e5903

by biao
2016-07-28 18:14:45 +0800
Browse Files
代码审查修复
2b5f065c

by 姜敏
2016-07-28 18:14:28 +0800
Browse Files
file comments
2475015f

by xuqi
2016-07-28 18:05:38 +0800
Browse Files
handle merge
cd55f60b

by 姜枫
2016-07-28 18:03:59 +0800
Browse Files
handle merge
7c314c68

by 姜枫
2016-07-28 18:03:07 +0800
Browse Files