web / yoho-live · Commits

28 Aug, 2016

11 commits

添加jsonp返回方法
62d18c12

by wuxiao
2016-08-28 17:13:48 +0800
Browse Files
Merge branch 'develop' into wuxiao ...
5ac7aaea
```
# Conflicts:
#	soa/controllers/v1/LivingController.php
```
by wuxiao
2016-08-28 15:56:59 +0800
Browse Files
Merge branch 'test' into develop
483e340a

by wuxiao
2016-08-28 15:55:37 +0800
Browse Files
Merge branch 'test' of http://git.yoho.cn/web/yoho-live into test
4f260911

by wuxiao
2016-08-28 15:52:51 +0800
Browse Files
添加禁言时候判断ssoid和昵称必填
f703b1fe

by 於志远
2016-08-28 15:56:43 +0800
Browse Files
修复精选排序
1eb88f3e

by wuxiao
2016-08-28 15:52:43 +0800
Browse Files
房间商品列表接口
14507de5

by wuxiao
2016-08-28 13:13:44 +0800
Browse Files
Merge branch 'develop' into wuxiao ...
94fa7aa8
```
# Conflicts:
#	soa/controllers/v1/LivingController.php
```
by wuxiao
2016-08-28 10:47:47 +0800
Browse Files
Merge branch 'test' into develop ...
a29ba624
```
# Conflicts:
#	common/config/params.php
```
by wuxiao
2016-08-28 10:39:18 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/web/yoho-live into develop ...
e04857c7
```
# Conflicts:
#	common/models/Video.php
```
by wuxiao
2016-08-28 10:36:26 +0800
Browse Files
删除多余的cache_prefix配置
66226471

by wuxiao
2016-08-28 10:29:31 +0800
Browse Files

27 Aug, 2016

18 commits

分享url出错问题
e745d68d

by xiaofeng.yao@yoho.cn
2016-08-27 21:04:47 +0800
Browse Files
列表获取在在线人数的不对
df35df38

by xiaofeng.yao@yoho.cn
2016-08-27 20:54:18 +0800
Browse Files
修改精选列表
c2fc2401

by xiaofeng.yao@yoho.cn
2016-08-27 19:25:35 +0800
Browse Files
直播预告时间为前一天并且未直播的视频，后台编辑成精选房间后，前台精选房间区域会正常展示，时间取错成 12.31 19:00 ...
043e798b
```
http://jira.yoho.cn:8888/browse/YH-3991
```
by wuxiao
2016-08-27 17:37:05 +0800
Browse Files
Merge branch 'test' of http://git.yoho.cn/web/yoho-live into test
9aa2706b

by wuxiao
2016-08-27 17:17:51 +0800
Browse Files
修改接口实时获取在线人数和观看人数的方式
b3ddc617

by wuxiao
2016-08-27 17:17:46 +0800
Browse Files
主播点结束就是结束
e398a3e0

by xiaofeng.yao@yoho.cn
2016-08-27 17:14:59 +0800
Browse Files
主播推流列表展示未开始、已结束的房间
c03f0e3b

by xiaofeng.yao@yoho.cn
2016-08-27 17:04:57 +0800
Browse Files
编辑直播间时去掉未到预告时间状态置成未开始的判断
119bafda

by xiaofeng.yao@yoho.cn
2016-08-27 16:29:59 +0800
Browse Files
Merge branch 'test' of git.yoho.cn:web/yoho-live into test
3862ede9

by xiaofeng.yao@yoho.cn
2016-08-27 15:51:40 +0800
Browse Files
增加直播预告时间字段
26fd23f8

by xiaofeng.yao@yoho.cn
2016-08-27 15:51:30 +0800
Browse Files
Merge branch 'test' of http://git.yoho.cn/web/yoho-live into test
c606730c

by wuxiao
2016-08-27 15:51:02 +0800
Browse Files
视频详情观看人数记录在redis中
900605b4

by wuxiao
2016-08-27 15:50:55 +0800
Browse Files
增加分享标题和分享内容
4366b4b7

by xiaofeng.yao@yoho.cn
2016-08-27 15:24:22 +0800
Browse Files
修复直播详情的点赞人数和观看人数bug ...
0140385b
```
修复短缓存bug
redis库使用5
```
by wuxiao
2016-08-27 14:49:43 +0800
Browse Files
修改详情接口
dd3a5a91

by xiaofeng.yao@yoho.cn
2016-08-27 14:18:34 +0800
Browse Files
修改详情直播预告时间
28904e10

by xiaofeng.yao@yoho.cn
2016-08-27 13:35:05 +0800
Browse Files
开始结束通知资讯
5f0e5e6d

by xiaofeng.yao@yoho.cn
2016-08-27 11:39:12 +0800
Browse Files

26 Aug, 2016

11 commits

Merge branch 'test' of http://git.yoho.cn/web/yoho-live into test
546263ec

by wuxiao
2016-08-26 18:14:10 +0800
Browse Files
接口短缓存添加app区分
38b005cb

by wuxiao
2016-08-26 18:14:04 +0800
Browse Files
加文字建议
6d3abf95

by xiaofeng.yao@yoho.cn
2016-08-26 17:59:49 +0800
Browse Files
商品推送websocket
6b69c90d

by wuxiao
2016-08-26 17:45:04 +0800
Browse Files
测试点赞
881dcdd8

by xiaofeng.yao@yoho.cn
2016-08-26 16:45:24 +0800
Browse Files
商品列表分页
e1e50438

by wuxiao
2016-08-26 16:15:46 +0800
Browse Files
修改左侧菜单逻辑 ...
93789c3c
```
直播间关联商品管理
```
by wuxiao
2016-08-26 16:05:34 +0800
Browse Files
修改刷状态脚本
ff609f78

by xiaofeng.yao@yoho.cn
2016-08-26 15:51:21 +0800
Browse Files
修改刷状态脚本
5575f1ac

by xiaofeng.yao@yoho.cn
2016-08-26 15:49:28 +0800
Browse Files
添加守护进程脚本
cdfab7a4

by xiaofeng.yao@yoho.cn
2016-08-26 15:19:21 +0800
Browse Files
视频bug
ea466514

by whb
2016-08-26 14:37:02 +0800
Browse Files