web / yoho-live · Commits

01 Sep, 2016

2 commits

ShmCache.php
268a044d

by wuxiao
2016-09-01 14:41:36 +0800
Browse Files
Parser.php
d5b80719

by wuxiao
2016-09-01 10:22:06 +0800
Browse Files

31 Aug, 2016

2 commits

InitController
e73f4c55

by wuxiao
2016-08-31 19:02:39 +0800
Browse Files
房间列表增加在线人数一列
0b312b89

by xiaofeng.yao@yoho.cn
2016-08-31 10:18:54 +0800
Browse Files

30 Aug, 2016

14 commits

Merge branch 'wuxiao' into develop
bae7c0d6

by wuxiao
2016-08-30 19:15:14 +0800
Browse Files
修复bug
4ca72f29

by xiaofeng.yao@yoho.cn
2016-08-30 19:01:06 +0800
Browse Files
监听直播房间商品推送 ...
3ff2c751
```
缓存键组件
```
by wuxiao
2016-08-30 16:39:59 +0800
Browse Files
更新文档
bbd12ef3

by xiaofeng.yao@yoho.cn
2016-08-30 15:01:39 +0800
Browse Files
设置开始结束接口变更
b1d11356

by xiaofeng.yao@yoho.cn
2016-08-30 14:56:15 +0800
Browse Files
Merge branch 'develop' into wuxiao
d8874f2a

by wuxiao
2016-08-30 14:47:06 +0800
Browse Files
Merge remote-tracking branch 'remotes/origin/test' into develop ...
cbd3af65
```
# Conflicts:
#	backend/models/Room.php
#	common/config/main.php
#	common/models/Room.php
#	soa/controllers/v1/LivingController.php
#	yii
```
by wuxiao
2016-08-30 14:20:20 +0800
Browse Files
缓存键组件
f48bd9f2

by wuxiao
2016-08-30 14:12:22 +0800
Browse Files
修复房间商品列表为空时的报错
efae6266

by wuxiao
2016-08-30 11:47:13 +0800
Browse Files
//ws.close()
3d529be2

by wuxiao
2016-08-30 11:40:51 +0800
Browse Files
/yii
d16f2849

by wuxiao
2016-08-30 10:48:29 +0800
Browse Files
Merge branch 'develop' of http://git.yoho.cn/web/yoho-live into develop
666e5728

by wuxiao
2016-08-30 10:00:54 +0800
Browse Files
Merge branch 'release' into test
af452b39

by xiaofeng.yao@yoho.cn
2016-08-30 09:36:32 +0800
Browse Files
app字段为int型验证
453b3588

by xiaofeng.yao@yoho.cn
2016-08-30 09:34:21 +0800
Browse Files

29 Aug, 2016

22 commits

Merge branch 'release' into test
9b91b428

by xiaofeng.yao@yoho.cn
2016-08-29 21:36:35 +0800
Browse Files
Room mode rule规则里app修改
2b4f35d8

by xiaofeng.yao@yoho.cn
2016-08-29 21:36:24 +0800
Browse Files
Merge branch 'release' into test
534a8c53

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

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

by xiaofeng.yao@yoho.cn
2016-08-29 20:30:07 +0800
Browse Files
获取有货商品信息
66ce85db

by wuxiao
2016-08-29 18:29:20 +0800
Browse Files
Merge branch 'release' into test
d9e09954

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

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

by xiaofeng.yao@yoho.cn
2016-08-29 17:24:29 +0800
Browse Files
修复列表数据为空时错误调用redis mget的问题
b5e198e6

by wuxiao
2016-08-29 17:03:14 +0800
Browse Files
缓存键生成组件
a763b319

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

by wuxiao
2016-08-29 16:30:38 +0800
Browse Files
缓存键生成组件
c769bf85

by wuxiao
2016-08-29 16:22:53 +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
Revert "Revert "增加后台刷房间状态脚本增加守护shell脚本"" ...
7f2b22bd
```
This reverts commit 7c406729.

# Conflicts:
#	backend/models/Room.php
#	common/config/params.php
#	common/models/Room.php
```
by wuxiao
2016-08-29 14:05:24 +0800
Browse Files
推流端增加秘钥获取推流地址接口
350dad74

by xiaofeng.yao@yoho.cn
2016-08-29 14:03:36 +0800
Browse Files
直播房间推送商品
f8847c02

by wuxiao
2016-08-29 12:45:28 +0800
Browse Files
去掉redis缓存多余的json_encode步骤
756c395d

by wuxiao
2016-08-29 11:19:56 +0800
Browse Files