fe / YOHOBUYPC · Commits

19 Feb, 2016

40 commits

Merge branch 'develop/wap' into beta/wap
112a53eb

by Rock Zhang
2016-02-19 22:00:33 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
0640738e

by Rock Zhang
2016-02-19 22:00:15 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
1475d9db

by 毕凯
2016-02-19 21:58:28 +0800
Browse Files
微信分享调试
294e214b

by 毕凯
2016-02-19 21:58:19 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
a499db91

by Rock Zhang
2016-02-19 21:28:44 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
7379e947

by Rock Zhang
2016-02-19 21:27:42 +0800
Browse Files
将用户测试的元宵抽签结果类型type也存入url，用于解决微信分享标题与内容不同步的bug ...
24499bd9
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 21:26:03 +0800
Browse Files
添加获取用户详情是否添加缓存的配置参数 ...
c293596a
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 21:24:55 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap ...
fb9f0477
```
Conflicts:
	yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Yuanxiao.php
```
by Rock Zhang
2016-02-19 20:56:47 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
99183004

by Rock Zhang
2016-02-19 20:55:16 +0800
Browse Files
更新时间选择
934b2851

by 毕凯
2016-02-19 20:41:00 +0800
Browse Files
Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap
c607980e

by hf
2016-02-19 20:34:03 +0800
Browse Files
code review by fei.hong : do format yuanxiao huodong codes
265f4e6b

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

by Rock Zhang
2016-02-19 20:21:24 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
94bd1a2b

by Rock Zhang
2016-02-19 20:21:00 +0800
Browse Files
等待动画问题修复
369802e8

by 毕凯
2016-02-19 20:19:42 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
9eee09aa

by Rock Zhang
2016-02-19 20:10:38 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
a59981f5

by Rock Zhang
2016-02-19 20:10:20 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao ...
527a26dc
```
uanxiao
```
by 毕凯
2016-02-19 20:07:51 +0800
Browse Files
app 分享调用
be2fd429

by 毕凯
2016-02-19 20:07:16 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
c4138040

by Rock Zhang
2016-02-19 19:02:28 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
37e8f10d

by Rock Zhang
2016-02-19 19:02:10 +0800
Browse Files
去除打印信息
2c4a8805

by Rock Zhang
2016-02-19 19:01:49 +0800
Browse Files
更新静态资源版本号
82259fbb

by 毕凯
2016-02-19 19:00:45 +0800
Browse Files
增加 share id
9e9baca2

by 毕凯
2016-02-19 18:48:22 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
13df04fd

by Rock Zhang
2016-02-19 18:46:24 +0800
Browse Files
Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
927e5ce4

by Rock Zhang
2016-02-19 18:45:58 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
25cb7507

by Rock Zhang
2016-02-19 18:45:46 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
f80d4230

by 毕凯
2016-02-19 18:43:59 +0800
Browse Files
修复元宵抽签活动post请求报错时日期显示错误的bug ...
90417821
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 18:43:08 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
64b23575

by 毕凯
2016-02-19 18:38:36 +0800
Browse Files
等待页面优化
a27e5038

by 毕凯
2016-02-19 18:38:23 +0800
Browse Files
格式化元宵抽签活动中生日以便接口接收和前端显示 ...
6300659e
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 18:35:20 +0800
Browse Files
Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap
13bf4a5e

by biao
2016-02-19 18:24:26 +0800
Browse Files
修复购物车面板滑动问题。code review by LZF
34530dde

by biao
2016-02-19 18:24:08 +0800
Browse Files
修复购物车面板滑动问题。code review by LZF
557de3bf

by biao
2016-02-19 18:24:01 +0800
Browse Files
微信分享修改
40ad1497

by 毕凯
2016-02-19 18:11:34 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
29590fe1

by Rock Zhang
2016-02-19 18:01:45 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
36fc52de

by Rock Zhang
2016-02-19 18:01:22 +0800
Browse Files
更新静态资源版本号
e5ba03b5

by 毕凯
2016-02-19 17:54:22 +0800
Browse Files