fe / yoho-blk · Commits

28 Jul, 2016

9 commits

change alipay id
1462de64

by 姜枫
2016-07-28 10:58:32 +0800
Browse Files
change alipay id
7e5a94ce

by 姜枫
2016-07-28 10:57:54 +0800
Browse Files
handle merge
7114dffa

by 姜枫
2016-07-28 10:53:50 +0800
Browse Files
fix bugs
f9305595

by 姜枫
2016-07-28 10:53:23 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
861591ba

by yyq
2016-07-28 10:02:10 +0800
Browse Files
round-color颜色显示异常问题修复
ec6cc44e

by yyq
2016-07-28 10:01:34 +0800
Browse Files
代码优化及修复个人设置部分bug
85781b0d

by 姜敏
2016-07-28 09:50:35 +0800
Browse Files
代码优化及修复个人设置部分bug
0aa69926

by 姜敏
2016-07-28 09:50:20 +0800
Browse Files
fix cancel apply bug
dcfdd88e

by biao
2016-07-28 09:38:19 +0800
Browse Files

27 Jul, 2016

31 commits

update for show cancel correctly
9150f231

by biao
2016-07-27 21:29:26 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
db68e53c

by biao
2016-07-27 21:09:18 +0800
Browse Files
update for detail url
9a764cac

by biao
2016-07-27 21:08:35 +0800
Browse Files
update for detail url
614d6df1

by biao
2016-07-27 21:06:28 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
88850dd7

by htoooth
2016-07-27 19:03:30 +0800
Browse Files
添加注释
6a618023

by htoooth
2016-07-27 19:03:19 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
8c68c0c9

by 姜敏
2016-07-27 18:43:17 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
9a9e52b9

by biao
2016-07-27 18:34:54 +0800
Browse Files
update for exchange cancel
fa54760e

by biao
2016-07-27 18:34:40 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0 ...
56a9dbb0
```
# Conflicts:
#	apps/me/controllers/setting.js
#	apps/me/models/setting.js
#	apps/me/views/partial/setting/content.hbs
```
by 姜敏
2016-07-27 18:34:37 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0 ...
6eca821a
```
# Conflicts:
#	apps/me/controllers/setting.js
#	apps/me/models/setting.js
#	apps/me/views/partial/setting/content.hbs
```
by 姜敏
2016-07-27 18:33:57 +0800
Browse Files
个人设置--头像上传
d9d6d4f9

by 姜敏
2016-07-27 18:31:06 +0800
Browse Files
商品名过长处理
f105c256

by yyq
2016-07-27 18:28:44 +0800
Browse Files
Merge branch 'release/1.0' of git.yoho.cn:fe/yoho-blk into release/1.0
0dbf3232

by yyq
2016-07-27 18:15:52 +0800
Browse Files
限制退货商品提示
129af57b

by yyq
2016-07-27 18:14:50 +0800
Browse Files
增加部分函数注释
e2c1438b

by htoooth
2016-07-27 17:57:28 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
77c40980

by htoooth
2016-07-27 17:48:06 +0800
Browse Files
链式调用
0abfaea8

by htoooth
2016-07-27 17:47:53 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
9b1ef651

by biao
2016-07-27 17:46:15 +0800
Browse Files
update for good url
af9e651a

by biao
2016-07-27 17:46:02 +0800
Browse Files
Merge remote-tracking branch 'origin/release/1.0' into release/1.0
7d34d58b

by htoooth
2016-07-27 17:24:00 +0800
Browse Files
调整字体大小
c5fa3504

by htoooth
2016-07-27 17:23:41 +0800
Browse Files
update for nav text
d323ab43

by biao
2016-07-27 17:17:49 +0800
Browse Files
调整css
0adcc544

by htoooth
2016-07-27 17:15:12 +0800
Browse Files
Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0
4e1fbf07

by biao
2016-07-27 17:12:54 +0800
Browse Files
update for uid
84682964

by biao
2016-07-27 17:12:27 +0800
Browse Files
remove params
e560342c

by 姜枫
2016-07-27 17:10:28 +0800
Browse Files
Merge branch release/1.0 of http://git.yoho.cn/fe/yoho-blk into release/1.0
f82fc3c7

by 姜枫
2016-07-27 17:03:49 +0800
Browse Files
Merge branch release/1.0 of http://git.yoho.cn/fe/yoho-blk into release/1.0
df7dba54

by 姜枫
2016-07-27 17:03:31 +0800
Browse Files
fix some bug
2bb1aa33

by 姜枫
2016-07-27 17:03:03 +0800
Browse Files
fix some bug
f2650330

by 姜枫
2016-07-27 17:02:52 +0800
Browse Files