fe / YOHOBUYWAP · Commits

22 Apr, 2016

32 commits

新潮教室bug修改
26a479d4

by 王水玲
2016-04-22 18:26:34 +0800
Browse Files
添加结算页可用优惠券的数目
22c20c33

by Rock Zhang
2016-04-22 18:10:58 +0800
Browse Files
错别字修改
173c86ef

by 毕凯
2016-04-22 17:53:45 +0800
Browse Files
增加优惠券可用张数
78fec3e7

by 毕凯
2016-04-22 17:42:00 +0800
Browse Files
增加优惠券可用张数
17b7cd9a

by 毕凯
2016-04-22 17:40:20 +0800
Browse Files
Merge branch 'feature/wap4.3' of http://git.dev.yoho.cn/web/yohobuy into feature/wap4.3
e81847f3

by 王水玲
2016-04-22 16:31:25 +0800
Browse Files
领券中心修改
1de69af7

by 王水玲
2016-04-22 16:30:50 +0800
Browse Files
Merge branch 'feature/activity-api' into feature/wap4.3 ...
eabeac85
```
Conflicts:
	yohobuy/m.yohobuy.com/application/controllers/Coupon.php
```
by Rock Zhang
2016-04-22 15:58:02 +0800
Browse Files
添加对app中client_secret的校验 ...
f2d1975d
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-22 15:46:34 +0800
Browse Files
样式名修改
270a4edb

by uedxwg
2016-04-22 15:34:29 +0800
Browse Files
Merge branch 'feature/wap4.3' of http://git.dev.yoho.cn/web/yohobuy into feature/wap4.3
eaff4091

by biao
2016-04-22 15:00:54 +0800
Browse Files
debounce the like click on guang page
89eaed57

by biao
2016-04-22 15:00:38 +0800
Browse Files
Merge branch 'feature/wap4.3' of http://git.dev.yoho.cn/web/yohobuy into feature/wap4.3
0637cfe6

by 王水玲
2016-04-22 14:55:48 +0800
Browse Files
coupon gulp ge
2e0ec837

by 王水玲
2016-04-22 14:55:26 +0800
Browse Files
Merge branch 'feature/wap4.3' of git.dev.yoho.cn:web/yohobuy into feature/wap4.3
a5fe2b29

by Rock Zhang
2016-04-22 14:42:18 +0800
Browse Files
coupon gulp ge
b19cee3b

by 王水玲
2016-04-22 14:42:00 +0800
Browse Files
修复在线客服和帮助中心数据获取不到的bug ...
0e6bec26
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-22 14:41:35 +0800
Browse Files
coupon gulp ge
18fa347c

by 王水玲
2016-04-22 14:35:12 +0800
Browse Files
coupon
352f9434

by 王水玲
2016-04-22 14:31:05 +0800
Browse Files
coupon gulp ge
10729d4b

by 王水玲
2016-04-22 14:18:35 +0800
Browse Files
coupon图片提交
836eb7bf

by 王水玲
2016-04-22 14:08:07 +0800
Browse Files
merge master
0cab640b

by 梁志锋
2016-04-22 13:14:15 +0800
Browse Files
去掉https
fba40eb2

by 梁志锋
2016-04-22 13:12:02 +0800
Browse Files
Merge branch 'hotfix/cate-bug' into feature/wap4.3 ...
682b7307
```
Conflicts:
	static/js/common.js
	template/m.yohobuy.com/actions/passport/login/index.phtml
```
by Rock Zhang
2016-04-22 11:32:50 +0800
Browse Files
H5修复分类不显示的bug
0bc4b48d

by xiaowei
2016-04-22 11:18:02 +0800
Browse Files
web-static 逛相关
8f0eb52c

by whb
2016-04-22 10:34:34 +0800
Browse Files
PC删除Home和ME
3e792638

by whb
2016-04-22 10:14:33 +0800
Browse Files
Merge branch 'feature/xingchao' into feature/wap4.3
3a04c3c2

by yangyang
2016-04-22 10:10:11 +0800
Browse Files
修改uid获取
2e826329

by yangyang
2016-04-22 10:09:12 +0800
Browse Files
Merge branch 'temp'
31bfc595

by whb
2016-04-22 10:04:05 +0800
Browse Files
rn 版本号秘钥
7af2f6f5

by 郝肖肖
2016-04-22 09:56:53 +0800
Browse Files
添加4.1.0包下载地址
9cc20acf

by 郝肖肖
2016-04-22 09:56:40 +0800
Browse Files

21 Apr, 2016

8 commits

merge coupon
457105d4

by 梁志锋
2016-04-21 19:02:32 +0800
Browse Files
title
92027a1e

by 郭成尧
2016-04-21 18:49:46 +0800
Browse Files
领券中心
b3dda19a

by liangxs
2016-04-21 18:24:11 +0800
Browse Files
单张图片滚播图调整顺序撤销
a681c014

by 郭成尧
2016-04-21 18:06:41 +0800
Browse Files
单张图片滚播图换位置
d7232ac8

by 郭成尧
2016-04-21 18:00:04 +0800
Browse Files
修复第三方登录失败的bug（调用helpers中函数错误) ...
fbd15dc0
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-21 17:59:24 +0800
Browse Files
Merge branch 'hotfix/thirdLogin' into feature/wap4.3
8c3b5050

by Rock Zhang
2016-04-21 17:56:18 +0800
Browse Files
修复第三方登录失败的bug（调用helpers中函数错误) ...
5a4caf0e
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-04-21 17:54:35 +0800
Browse Files