fe / YOHOBUYWAP · Commits

06 Jun, 2016

16 commits

Merge branch 'feature/rebuy' into release/4.6 ...
71b5c29d
```
再次购买解决冲突
# Conflicts:
#	library/LibModels/Wap/Home/OrderData.php
#	static/js/me/order-detail.js
#	static/sass/me/_order.css
```
by cailing
2016-06-06 17:59:41 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
4e46a017

by 梁志锋
2016-06-06 17:13:24 +0800
Browse Files
Merge branch 'hotfix/evaluate'
f82ed70f

by yyq
2016-06-06 14:33:32 +0800
Browse Files
咨询样式调整
c6157310

by yyq
2016-06-06 14:31:01 +0800
Browse Files
修改为正式环境
e32331c9

by 梁志锋
2016-06-06 13:44:01 +0800
Browse Files
升到1.3.30
d6dd5ddd

by 梁志锋
2016-06-06 13:12:14 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/release/4.5'
1bb9f302

by 梁志锋
2016-06-06 13:07:45 +0800
Browse Files
shop base search
748a5fbd

by 周少峰
2016-06-06 13:01:11 +0800
Browse Files
Merge branch 'release/4.5' of http://git.yoho.cn/fe/yohobuywap into release/4.5
188e4620

by 周少峰
2016-06-06 12:32:53 +0800
Browse Files
shop base search
06b41f95

by 周少峰
2016-06-06 12:32:42 +0800
Browse Files
'去掉jumptoshop'
a69d62e7

by 郭成尧
2016-06-06 11:31:51 +0800
Browse Files
'jumptoShop添加'
20107377

by 郭成尧
2016-06-06 11:23:00 +0800
Browse Files
Merge remote-tracking branch 'origin/master'
a3b6d5db

by 梁志锋
2016-06-06 10:35:42 +0800
Browse Files
升到1.3.30
e2e09458

by 梁志锋
2016-06-06 10:35:17 +0800
Browse Files
1.3.30
6968ee59

by 梁志锋
2016-06-06 10:34:52 +0800
Browse Files
'人气品牌跳转去掉jumpshop=y'
f0b82d6a

by 郭成尧
2016-06-06 10:09:49 +0800
Browse Files

05 Jun, 2016

1 commit

android hot fix 0605
1acb21d4

by 曹镏
2016-06-05 11:49:43 +0800
Browse Files

04 Jun, 2016

7 commits

1.3.29
19fd8ba6

by 梁志锋
2016-06-04 16:15:12 +0800
Browse Files
1.3.29
c8ba85e0

by 梁志锋
2016-06-04 16:08:38 +0800
Browse Files
Ìύ1.3.29
84c4aca4

by 梁志锋
2016-06-04 16:00:50 +0800
Browse Files
Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5
31e04774

by 梁志锋
2016-06-04 15:52:57 +0800
Browse Files
merge master 为上线做准备
524b6c04

by 梁志锋
2016-06-04 15:52:31 +0800
Browse Files
删除多余的css文件，以及修改文字超长不换行的问题。
a218d146

by 梁志锋
2016-06-04 15:48:43 +0800
Browse Files
shop tpl
874db161

by yyq
2016-06-04 12:23:49 +0800
Browse Files

03 Jun, 2016

16 commits

逛双头部问题
d512ee23

by xiaowei
2016-06-03 20:30:53 +0800
Browse Files
恢复helpers
60d1c41c

by xiaowei
2016-06-03 19:52:05 +0800
Browse Files
升级到1.3.29
e8ced45a

by 梁志锋
2016-06-03 19:40:37 +0800
Browse Files
Éý¼¶µ½1.3.29
0c352ce6

by 梁志锋
2016-06-03 19:36:25 +0800
Browse Files
Éý¼¶µ½1.3.29
ac406c52

by 梁志锋
2016-06-03 19:35:58 +0800
Browse Files
双头部问题
60fb0518

by xiaowei
2016-06-03 19:35:40 +0800
Browse Files
线上问题：逛的活动页面https的问题
6931eee2

by 梁志锋
2016-06-03 19:21:41 +0800
Browse Files
Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5
12cc9c88

by liangxs
2016-06-03 19:03:54 +0800
Browse Files
suggest-sub样式还原
97786b76

by liangxs
2016-06-03 19:03:43 +0800
Browse Files
底部位置显示不正确
ca2263f2

by liangxs
2016-06-03 19:00:54 +0800
Browse Files
gulp ge
08309a4c

by 毕凯
2016-06-03 18:35:09 +0800
Browse Files
完善 jit 拆单地址修改
3d3119f1

by 毕凯
2016-06-03 18:34:19 +0800
Browse Files
fix guang img issue
92817fb1

by biao
2016-06-03 18:14:25 +0800
Browse Files
Merge branch 'release/4.5' of http://git.yoho.cn/fe/YOHOBUYWAP into release/4.5
49af849e

by 梁志锋
2016-06-03 18:07:45 +0800
Browse Files
修改测试环境测试服务的地址
c9ef1219

by 梁志锋
2016-06-03 17:59:01 +0800
Browse Files
Merge branch 'release/4.5' of git.yoho.cn:fe/YOHOBUYWAP into release/4.5
cfccbda9

by 郭成尧
2016-06-03 17:55:43 +0800
Browse Files