fe / yoho-blk · Commits

29 Jul, 2016

40 commits

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

by biao
2016-07-29 16:50:33 +0800
Browse Files
update for name validation
1347c65d

by biao
2016-07-29 16:50:21 +0800
Browse Files
catch error
ab0003ec

by jinhu.tung
2016-07-29 16:49:54 +0800
Browse Files
Merge branch 'feature/shopping' into release/1.0
7f1a8506

by jinhu.tung
2016-07-29 16:45:31 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
bb3c7945

by htoooth
2016-07-29 16:42:52 +0800
Browse Files
增加array foreach polyfill.
4756188b

by htoooth
2016-07-29 16:42:27 +0800
Browse Files
handle merge
25d29b4b

by 姜枫
2016-07-29 16:40:40 +0800
Browse Files
handle merge
7cae2742

by 姜枫
2016-07-29 16:40:33 +0800
Browse Files
fix list page image bug
56f950cc

by 姜枫
2016-07-29 16:40:03 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
e4cd0010

by htoooth
2016-07-29 16:27:28 +0800
Browse Files
增加function bind polyfill，修证部分css样式问题
bdc46338

by htoooth
2016-07-29 16:27:02 +0800
Browse Files
fix editable stylesheet
9d6e21e0

by jinhu.tung
2016-07-29 16:25:05 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
dc93cb77

by xuqi
2016-07-29 16:06:52 +0800
Browse Files
phone regx
281ab018

by xuqi
2016-07-29 16:06:31 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
42acb14a

by 姜敏
2016-07-29 15:53:22 +0800
Browse Files
修复个人设置中默认头像，以及收不到短信的问题
a36feef8

by 姜敏
2016-07-29 15:52:57 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0 ...
cabddeb6
```
Conflicts:
	apps/me/views/partial/exchange-detail.hbs
```
by xuqi
2016-07-29 15:47:21 +0800
Browse Files
service online link
9596d28e

by xuqi
2016-07-29 15:45:37 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
ade181bd

by biao
2016-07-29 15:45:10 +0800
Browse Files
update for empty order message
16f346a6

by biao
2016-07-29 15:44:55 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
fc61f188

by yyq
2016-07-29 15:33:30 +0800
Browse Files
退货详情须知
940211de

by yyq
2016-07-29 15:32:28 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
317b3e13

by biao
2016-07-29 15:25:55 +0800
Browse Files
update for btn position
7aa02175

by biao
2016-07-29 15:25:42 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
32502b45

by htoooth
2016-07-29 15:24:06 +0800
Browse Files
refactor
b49e1171

by htoooth
2016-07-29 15:23:36 +0800
Browse Files
exchange
486d427a

by zhangxiaoru
2016-07-29 15:21:02 +0800
Browse Files
exchange
84aa20ee

by zhangxiaoru
2016-07-29 15:20:42 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
709dcc73

by biao
2016-07-29 15:15:21 +0800
Browse Files
update for detail address
3d52c565

by biao
2016-07-29 15:15:09 +0800
Browse Files
add app_type in config
6be996ef

by 姜枫
2016-07-29 15:14:27 +0800
Browse Files
ex
578b5201

by zhangxiaoru
2016-07-29 15:08:14 +0800
Browse Files
exchange
9daa0ec3

by zhangxiaoru
2016-07-29 15:06:20 +0800
Browse Files
exchange
77456083

by zhangxiaoru
2016-07-29 15:05:22 +0800
Browse Files
handle merge
0ae6b789

by 姜枫
2016-07-29 14:59:24 +0800
Browse Files
handle merge
35bd8dfe

by 姜枫
2016-07-29 14:59:10 +0800
Browse Files
fix bug 432
5ce9c480

by 姜枫
2016-07-29 14:58:57 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
f2862bc7

by biao
2016-07-29 14:57:00 +0800
Browse Files
update for limit the good name length for display
e2906878

by biao
2016-07-29 14:56:51 +0800
Browse Files
uid
693b4553

by xuqi
2016-07-29 14:51:56 +0800
Browse Files