fe / YOHOBUYPC · Commits

19 Feb, 2016

31 commits

code review by fei.hong : do add app api Rn.php
55cc5f88

by hf
2016-02-19 15:53:00 +0800
Browse Files
新增rn接口
5334e198

by cl
2016-02-19 15:50:33 +0800
Browse Files
Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap
1caae86f

by hf
2016-02-19 15:20:28 +0800
Browse Files
code review by fei.hong : modify coupon newuser activity id
51e60370

by hf
2016-02-19 15:20:15 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
bbdf2fc8

by Rock Zhang
2016-02-19 15:11:21 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
063d58a6

by Rock Zhang
2016-02-19 15:11:00 +0800
Browse Files
修复元宵抽签活动中性别传递的值错误的bug ...
20842289
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 15:10:39 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap
b0832964

by 梁志锋
2016-02-19 15:00:50 +0800
Browse Files
确定取消的点击效果
907ca80b

by 梁志锋
2016-02-19 15:00:29 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap ...
2988c36e
```
Conflicts:
	library/Api/Yohobuy.php
```
by Rock Zhang
2016-02-19 14:59:42 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
da892c2a

by Rock Zhang
2016-02-19 14:58:39 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
2783ba2f

by Rock Zhang
2016-02-19 14:58:19 +0800
Browse Files
修改为测试环境接口，方便测试
f079f481

by Rock Zhang
2016-02-19 14:58:06 +0800
Browse Files
增加生日限制
b087fd6e

by 毕凯
2016-02-19 14:54:29 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
9e72f5dd

by Rock Zhang
2016-02-19 14:53:24 +0800
Browse Files
添加实际业务逻辑 ...
b520c33a
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 14:53:06 +0800
Browse Files
更新静态资源版本
cd85d4a0

by 毕凯
2016-02-19 14:44:03 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
5206fef1

by 毕凯
2016-02-19 14:41:31 +0800
Browse Files
元宵抽签动画完善
dc65a74c

by 毕凯
2016-02-19 14:40:32 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
439e9851

by Rock Zhang
2016-02-19 14:01:46 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
455e0ebe

by Rock Zhang
2016-02-19 14:01:02 +0800
Browse Files
修复低版本php会报错的bug ...
1225a6d0
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 14:00:08 +0800
Browse Files
更新到201602191341静态资源
ac77bdb5

by Rock Zhang
2016-02-19 13:41:14 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
aee13849

by Rock Zhang
2016-02-19 13:36:21 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
5fe53bc7

by Rock Zhang
2016-02-19 13:34:19 +0800
Browse Files
在元宵抽签页临时添加type参数以便查看不同抽签结果 ...
e9ec1774
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 13:30:17 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
097a28ce

by Rock Zhang
2016-02-19 13:25:19 +0800
Browse Files
添加元宵节抽签活动调用接口的逻辑 ...
6021afe3
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 13:24:35 +0800
Browse Files
静态资源版本号升级
30743601

by 毕凯
2016-02-19 13:17:08 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
57a23098

by 毕凯
2016-02-19 13:14:14 +0800
Browse Files
元宵抽签活动完善
4093000b

by 毕凯
2016-02-19 13:09:42 +0800
Browse Files

18 Feb, 2016

9 commits

gulp ge文件
ffa03907

by 梁志锋
2016-02-18 18:16:01 +0800
Browse Files
切换数据库
3b8b3cf0

by 梁志锋
2016-02-18 18:14:40 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/develop/wap' into beta/wap
2ef51370

by 梁志锋
2016-02-18 18:13:46 +0800
Browse Files
增加对话框按钮点击效果.code review by LZF
b3d941f4

by biao
2016-02-18 18:06:03 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
9016e68b

by Rock Zhang
2016-02-18 18:06:02 +0800
Browse Files
走通元宵节抽签活动所有流程（接口暂时未提供） ...
dc2eeef1
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-18 18:05:10 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao ...
cc4998fe
```
Conflicts:
	yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Yuanxiao.php
```
by Rock Zhang
2016-02-18 18:04:57 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
c80e15fb

by 梁志锋
2016-02-18 17:59:36 +0800
Browse Files
加价购赠品页面文字超长问题
d0a7d53e

by 梁志锋
2016-02-18 17:30:10 +0800
Browse Files