web / yoho-live · Commits

23 Aug, 2016

15 commits

Merge branch 'develop' of http://git.yoho.cn/web/yoho-live into develop
f0c0038b

by wuxiao
2016-08-23 16:21:15 +0800
Browse Files
修复后台跳转bug ...
f227728a
```
修复接口视频列表bug
```
by wuxiao
2016-08-23 16:21:09 +0800
Browse Files
获取禁言用户接口修改
a6aa57ed

by xiaofeng.yao@yoho.cn
2016-08-23 16:11:30 +0800
Browse Files
回放在线人数读取源修改
5ec0d973

by wuxiao
2016-08-23 16:01:53 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/web/yoho-live into develop
dc1de87d

by wuxiao
2016-08-23 14:09:33 +0800
Browse Files
修改接口文档
e8883ac9

by wuxiao
2016-08-23 14:09:26 +0800
Browse Files
新增接口（直播结束通知本次直播的相关参数）
5969bb0d

by xiaofeng.yao@yoho.cn
2016-08-23 14:03:47 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/web/yoho-live into develop
12b07363

by wuxiao
2016-08-23 13:53:40 +0800
Browse Files
解决getreplaybarrage接口返回的不是json格式的问题
058c0bfa

by wuxiao
2016-08-23 13:53:34 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/web/yoho-live.git into develop
687210dc

by whb
2016-08-23 13:36:05 +0800
Browse Files
视频app
f140b841

by whb
2016-08-23 13:35:52 +0800
Browse Files
主播修改
973f8893

by xiaofeng.yao@yoho.cn
2016-08-23 13:34:50 +0800
Browse Files
增加是否启用缓存的设置项
4e74ab7f

by wuxiao
2016-08-23 13:27:55 +0800
Browse Files
在线人数字段
f013ac78

by wuxiao
2016-08-23 11:57:00 +0800
Browse Files
将校验代码放到权限组件中
1852a058

by wuxiao
2016-08-23 10:54:34 +0800
Browse Files

22 Aug, 2016

5 commits

修复设置直播结束错误问题
e2bef8ca

by xiaofeng.yao@yoho.cn
2016-08-22 17:18:09 +0800
Browse Files
修复设置直播结束错误问题
2ac15334

by xiaofeng.yao@yoho.cn
2016-08-22 17:06:56 +0800
Browse Files
录播任务改成推流推
7a21a6b4

by xiaofeng.yao@yoho.cn
2016-08-22 15:23:36 +0800
Browse Files
录播任务修改
5ee5f9fd

by xiaofeng.yao@yoho.cn
2016-08-22 13:38:18 +0800
Browse Files
Merge branch 'wuxiao' into develop
0bb74846

by wuxiao
2016-08-22 09:03:49 +0800
Browse Files

19 Aug, 2016

17 commits

后台权限控制
0af78bcc

by wuxiao
2016-08-19 18:49:20 +0800
Browse Files
推流接口列表修改
72b140bb

by xiaofeng.yao@yoho.cn
2016-08-19 17:45:48 +0800
Browse Files
Merge branch 'wuxiao' into develop
c2dc418b

by wuxiao
2016-08-19 17:25:09 +0800
Browse Files
删除代码
579eedcb

by wuxiao
2016-08-19 17:24:58 +0800
Browse Files
Merge branch 'wuxiao' into develop
198929cc

by wuxiao
2016-08-19 16:57:32 +0800
Browse Files
添加backend/components/filters/AccessControl.php
c07776fb

by wuxiao
2016-08-19 16:56:42 +0800
Browse Files
调用腾讯接口返回写日志
79238e46

by xiaofeng.yao@yoho.cn
2016-08-19 16:14:17 +0800
Browse Files
Merge branch 'develop' into wuxiao
6694e2eb

by wuxiao
2016-08-19 15:55:16 +0800
Browse Files
房间状态修正
5bb81ce7

by wuxiao
2016-08-19 15:54:44 +0800
Browse Files
修改创建录制和停止录制方法
8f17b2e7

by xiaofeng.yao@yoho.cn
2016-08-19 14:35:40 +0800
Browse Files
更新文档
a68f0db6

by xiaofeng.yao@yoho.cn
2016-08-19 13:57:20 +0800
Browse Files
修改推流接口
4fb5a5ee

by xiaofeng.yao@yoho.cn
2016-08-19 13:55:30 +0800
Browse Files
优化room/setnums代码逻辑
256389fc

by wuxiao
2016-08-19 12:33:06 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/web/yoho-live into develop
079485a7

by wuxiao
2016-08-19 11:37:58 +0800
Browse Files
增加一个other私钥
ec9cae2a

by wuxiao
2016-08-19 11:37:52 +0800
Browse Files
room/setnums接口修改
aad19773

by xiaofeng.yao@yoho.cn
2016-08-19 10:43:34 +0800
Browse Files
命令行修改后台用户 ...
dba9525f
```
密钥检验修改
```
by wuxiao
2016-08-19 10:27:12 +0800
Browse Files

18 Aug, 2016

3 commits

加上接口校验和校验开关参数
5942b278

by wuxiao
2016-08-18 18:36:01 +0800
Browse Files
Merge branch 'wuxiao' into develop ...
eb034e2b
```
# Conflicts:
#	README.md
```
by wuxiao
2016-08-18 18:21:22 +0800
Browse Files
用户登录/登出 ...
41bd5ebd
```
回放接口添加水印字段
```
by wuxiao
2016-08-18 18:13:02 +0800
Browse Files