web / yoho-live · Commits

29 Aug, 2016

23 commits

Merge branch 'release'
1b871a3d

by xiaofeng.yao@yoho.cn
2016-08-29 20:31:12 +0800
Browse Files
修复列表数据为空时错误调用redis mget的问题【by yaoxiaofeng】
3419f6fa

by xiaofeng.yao@yoho.cn
2016-08-29 20:30:07 +0800
Browse Files
Room model里去掉app类型校验字段
ecf29115

by xiaofeng.yao@yoho.cn
2016-08-29 20:14:00 +0800
Browse Files
修改导入马甲页面
feadb3d8

by xiaofeng.yao@yoho.cn
2016-08-29 18:09:49 +0800
Browse Files
调试关闭
7ca102dd

by xiaofeng.yao@yoho.cn
2016-08-29 17:28:34 +0800
Browse Files
Merge branch 'release'
7608f290

by xiaofeng.yao@yoho.cn
2016-08-29 17:24:49 +0800
Browse Files
修改redis 不支持命令 select quit
d4e22f85

by xiaofeng.yao@yoho.cn
2016-08-29 17:24:29 +0800
Browse Files
调试
35cb7fb4

by xiaofeng.yao@yoho.cn
2016-08-29 17:06:35 +0800
Browse Files
Merge branch 'release'
dc4130e3

by wuxiao
2016-08-29 16:32:45 +0800
Browse Files
修正Room模型
cc1ed2c1

by wuxiao
2016-08-29 16:30:38 +0800
Browse Files
修改分享文案
c2682323

by xiaofeng.yao@yoho.cn
2016-08-29 15:04:32 +0800
Browse Files
修改后台刷房间状态脚本
17b0e339

by xiaofeng.yao@yoho.cn
2016-08-29 14:39:22 +0800
Browse Files
Merge branch 'test' into release
363758cf

by xiaofeng.yao@yoho.cn
2016-08-29 14:38:13 +0800
Browse Files
上传图片添加进度条
14e9ed4b

by whb
2016-08-29 14:28:42 +0800
Browse Files
更新文档
2842ac83

by xiaofeng.yao@yoho.cn
2016-08-29 14:17:17 +0800
Browse Files
Merge branch 'release'
4089e1aa

by xiaofeng.yao@yoho.cn
2016-08-29 11:03:39 +0800
Browse Files
提交两个忽略文件
e1f3aaf4

by xiaofeng.yao@yoho.cn
2016-08-29 11:03:27 +0800
Browse Files
Merge branch 'release'
363a3e09

by xiaofeng.yao@yoho.cn
2016-08-29 10:52:18 +0800
Browse Files
刷房间状态脚本修改
688598e3

by xiaofeng.yao@yoho.cn
2016-08-29 10:51:51 +0800
Browse Files
Merge branch 'release'
8e14ef20

by xiaofeng.yao@yoho.cn
2016-08-29 10:15:49 +0800
Browse Files
修改数据库字段类型后恢复精选房间从小到大顺序排列
8fb2bcf5

by wuxiao
2016-08-29 10:10:10 +0800
Browse Files
提交YII文件
6e2c58f9

by xiaofeng.yao@yoho.cn
2016-08-29 10:06:22 +0800
Browse Files
Merge branch 'test' ...
1871a610
```
Conflicts:
	common/config/main.php
合并test至master（上线）
```
by xiaofeng.yao@yoho.cn
2016-08-29 09:57:18 +0800
Browse Files

28 Aug, 2016

9 commits

db设置超时时间
283f4ab7

by wuxiao
2016-08-28 17:34:21 +0800
Browse Files
Merge branch 'test' of http://git.yoho.cn/web/yoho-live into test
20f467b7

by wuxiao
2016-08-28 16:41:03 +0800
Browse Files
添加redis超时时间
7394dde7

by wuxiao
2016-08-28 16:40:58 +0800
Browse Files
Merge branch 'test' of git.yoho.cn:web/yoho-live into test
c990b5ef

by 於志远
2016-08-28 15:59:16 +0800
Browse Files
添加禁言时候判断ssoid和昵称必填 code str
99c13a4f

by 於志远
2016-08-28 15:59:03 +0800
Browse Files
添加禁言时候判断ssoid和昵称必填
f703b1fe

by 於志远
2016-08-28 15:56:43 +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
修复精选排序
1eb88f3e

by wuxiao
2016-08-28 15:52:43 +0800
Browse Files
删除多余的cache_prefix配置
66226471

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

27 Aug, 2016

8 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
添加yii命令文件
53193a65

by wuxiao
2016-08-27 17:22:20 +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