web / yoho-live · Commits

08 Sep, 2016

5 commits

后台房间结束推送按钮
e94cb2e1

by wuxiao
2016-09-08 16:26:29 +0800
Browse Files
Merge branch 'test' of http://git.yoho.cn/web/yoho-live into test
43cdf5db

by wuxiao
2016-09-08 14:43:06 +0800
Browse Files
接口项目错误捕抓句柄引导到index/error去 ...
543ffd8f
```
修复接口房间预告时间可能为null的错误
```
by wuxiao
2016-09-08 14:42:57 +0800
Browse Files
添加马甲菜单
ab8ff1f0

by xiaofeng.yao@yoho.cn
2016-09-08 14:39:57 +0800
Browse Files
添加马甲菜单
ca687aad

by xiaofeng.yao@yoho.cn
2016-09-08 14:32:59 +0800
Browse Files

07 Sep, 2016

6 commits

修复房间创建失败时预告时间回填不正确的问题 ...
2d603d57
```
可复用上传控件添加上传中提醒、冲突修复
```
by wuxiao
2016-09-07 15:28:18 +0800
Browse Files
后台添加YOHOapi请求到header打印在console ...
85c8fbed
```
房间编辑添加js表单验证
```
by wuxiao
2016-09-07 11:53:04 +0800
Browse Files
修复过了预告时间的预告仍然显示的问题
fe1045ab

by wuxiao
2016-09-07 10:18:11 +0800
Browse Files
wss换回ws协议
4884a8ad

by xiaofeng.yao@yoho.cn
2016-09-07 09:34:44 +0800
Browse Files
Merge branch 'hotfix-2016.9.7' into test
4d8170ce

by xiaofeng.yao@yoho.cn
2016-09-07 09:13:49 +0800
Browse Files
禁言页面每隔10s刷新、禁言页面拉宽
c37cf303

by xiaofeng.yao@yoho.cn
2016-09-07 09:13:15 +0800
Browse Files

06 Sep, 2016

2 commits

配置时区 ...
531c7438
```
修改房间预告时间的编辑
```
by wuxiao
2016-09-06 18:53:47 +0800
Browse Files
http://jira.yoho.cn:8888/browse/YH-4287
7bf51316

by wuxiao
2016-09-06 15:29:26 +0800
Browse Files

05 Sep, 2016

1 commit

修复ws => wss
9a6b93db

by xiaofeng.yao@yoho.cn
2016-09-05 11:22:33 +0800
Browse Files

02 Sep, 2016

10 commits

通过内建方法读取websocket推送服务地址
9beca1c1

by wuxiao
2016-09-02 18:17:54 +0800
Browse Files
Merge branch 'hotfix-20160902' into test
496eeea9

by xiaofeng.yao@yoho.cn
2016-09-02 15:40:29 +0800
Browse Files
修复评论列表数据不一致问题
5b67f2d9

by xiaofeng.yao@yoho.cn
2016-09-02 15:39:14 +0800
Browse Files
Merge branch 'develop' into test
8ce6df92

by xiaofeng.yao@yoho.cn
2016-09-02 12:37:56 +0800
Browse Files
合并
a282d08e

by xiaofeng.yao@yoho.cn
2016-09-02 12:37:37 +0800
Browse Files
Merge branch 'develop' into test ...
7c3b2e66
```
Conflicts:
	backend/views/product/list.php
	common/config/params-local.php
```
by xiaofeng.yao@yoho.cn
2016-09-02 12:37:16 +0800
Browse Files
修复yii\redis的database SELECT指令问题，database不配置或者配置为null，不发出SELECT指令
c3cf91d4

by wuxiao
2016-09-02 12:06:11 +0800
Browse Files
增加 product/list.php
de2c2598

by xiaofeng.yao@yoho.cn
2016-09-02 11:26:40 +0800
Browse Files
合并develop->test(漏文件)
1358145e

by xiaofeng.yao@yoho.cn
2016-09-02 11:24:19 +0800
Browse Files
合并develop->test
5ff69d2d

by xiaofeng.yao@yoho.cn
2016-09-02 11:20:43 +0800
Browse Files

01 Sep, 2016

13 commits

刷新商品列表修改
bdaa5eaa

by xiaofeng.yao@yoho.cn
2016-09-01 19:50:38 +0800
Browse Files
Merge branch 'wuxiao' into develop
0c90d701

by wuxiao
2016-09-01 18:40:34 +0800
Browse Files
登录失败提示 ...
157e644f
```
推送商品列表刷新指令
```
by wuxiao
2016-09-01 18:20:29 +0800
Browse Files
验证秘钥必须是数字类型
9c10cc59

by 於志远
2016-09-01 17:57:37 +0800
Browse Files
验证秘钥必须是数字类型
77f9e986

by 於志远
2016-09-01 17:56:52 +0800
Browse Files
验证秘钥必须是数字类型
d8770897

by 於志远
2016-09-01 17:55:52 +0800
Browse Files
验证秘钥必须是数字类型
00960737

by 於志远
2016-09-01 17:53:31 +0800
Browse Files
验证秘钥必须是数字类型
b0553c3f

by 於志远
2016-09-01 17:51:13 +0800
Browse Files
添加开发测试环境的左上角提示
8e22baf7

by wuxiao
2016-09-01 14:58:49 +0800
Browse Files
修正所有缓存前缀
4a692957

by wuxiao
2016-09-01 14:50:03 +0800
Browse Files
ShmCache.php
268a044d

by wuxiao
2016-09-01 14:41:36 +0800
Browse Files
Merge branch 'develop' into test ...
17d9dce2
```
Conflicts:
	common/config/main.php
	soa/controllers/v1/LivingController.php
```
by xiaofeng.yao@yoho.cn
2016-09-01 10:41:16 +0800
Browse Files
Parser.php
d5b80719

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

31 Aug, 2016

3 commits

InitController
e73f4c55

by wuxiao
2016-08-31 19:02:39 +0800
Browse Files
修改接口日志设置
128fe911

by wuxiao
2016-08-31 15:49:26 +0800
Browse Files
缩短获取回放弹幕接口的缓存更新依赖语句
d0ae24eb

by wuxiao
2016-08-31 15:13:17 +0800
Browse Files