wangshusheng / YOHOBUYPC · Commits

22 Feb, 2016

3 commits

Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop/wap
8380071d

by Rock Zhang
2016-02-22 10:18:10 +0800
Browse Files
修复app中分享有关
e102eea8

by Rock Zhang
2016-02-22 10:17:47 +0800
Browse Files
提交gulp ge文件
6bfffe19

by 梁志锋
2016-02-22 10:05:39 +0800
Browse Files

19 Feb, 2016

37 commits

code review by fei.hong : do format yuanxiao huodong codes check call app login
abae4c47

by hf
2016-02-19 22:58:52 +0800
Browse Files
静态资源版本升级
8c2765bd

by 毕凯
2016-02-19 22:48:30 +0800
Browse Files
静态资源版本升级
44b1a4bb

by 毕凯
2016-02-19 22:41:48 +0800
Browse Files
Merge branch 'develop/wap' into feature/wap/yuanxiao ...
d8a6e63a
```
Conflicts:
	yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Yuanxiao.php
```
by Rock Zhang
2016-02-19 22:32:04 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao
ed815914

by Rock Zhang
2016-02-19 22:30:54 +0800
Browse Files
merge
2437d501

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

by 毕凯
2016-02-19 22:22:56 +0800
Browse Files
完善微信分享
40548b16

by 毕凯
2016-02-19 22:22:50 +0800
Browse Files
code review by fei.hong : do format yuanxiao huodong codes check call app login
9a0ea043

by hf
2016-02-19 22:18:58 +0800
Browse Files
Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap
5e2a084c

by hf
2016-02-19 22:08:05 +0800
Browse Files
Merge branch 'develop/wap' into beta/wap
3a47ca3c

by Rock Zhang
2016-02-19 22:07:59 +0800
Browse Files
Merge branch 'feature/wap/yuanxiao' into develop/wap
764a3d53

by Rock Zhang
2016-02-19 22:07:16 +0800
Browse Files
修复元宵抽签活动标题 ...
f67c07d2
```
Code Review By Rock Zhang
```
by Rock Zhang
2016-02-19 22:06:47 +0800
Browse Files
Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap
9f8ba552

by hf
2016-02-19 22:02:13 +0800
Browse Files
code review by fei.hong : do format yuanxiao huodong codes check call app login
a2279e2a

by hf
2016-02-19 22:01:58 +0800
Browse Files
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