Commits · tag-80 · 夏彬 / zuiketang

01 Nov, 2016 40 commits
- Merge remote-tracking branch 'origin/dev' into dev · 83f48491
  汪波 authored Nov 01, 2016
  
  83f48491
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · b764d9c9
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  b764d9c9
- Merge remote-tracking branch 'origin/dev' into dev · b8eb654f
  杨培 authored Nov 01, 2016
  
  b8eb654f
- 修复发布课程页面课程介绍输入提示位置错误的问题 · caaf0eb0
  杨培 authored Nov 01, 2016
  
  caaf0eb0
- Merge remote-tracking branch 'origin/dev' into dev · 1afa0d85
  汪波 authored Nov 01, 2016
  
  1afa0d85
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 81da8851
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  81da8851
- 修改微信支付的错误 · 484339d7
  xiabin authored Nov 01, 2016
  
  484339d7
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · d427f9a7
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  d427f9a7
- Merge remote-tracking branch 'origin/dev' into dev · c2b2faad
  汪波 authored Nov 01, 2016
  
  c2b2faad
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 2407105a
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  2407105a
- Merge branch 'test' into dev · 6a973d84
  xiabin authored Nov 01, 2016
  
  6a973d84
- 您发布的课程，无需购买可直接观看。 · 4991e79e
  xiabin authored Nov 01, 2016
  
  4991e79e
- 密码不一致 · 33fc4c8c
  xiabin authored Nov 01, 2016
  
  33fc4c8c
- 密码不一致 · 044bfe5c
  xiabin authored Nov 01, 2016
  
  044bfe5c
- 密码不一致 · 1efed9b9
  xiabin authored Nov 01, 2016
  
  1efed9b9
- Merge remote-tracking branch 'origin/dev' into dev · e0ec2da2
  xiabin authored Nov 01, 2016
  
  e0ec2da2
- 修改utils定义的方法 · 00d6c581
  xiabin authored Nov 01, 2016
  
  00d6c581
- Merge remote-tracking branch 'origin/dev' into dev · a9c57066
  杨培 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/center.php
```
  a9c57066
- Merge remote-tracking branch 'origin/dev' into dev · 9d32cd3b
  xiabin authored Nov 01, 2016
  
  9d32cd3b
- 修复视频转码时,原视频编码不一致未作为主要参数导致未正确转码的问题 · 1d503fa5
  杨培 authored Nov 01, 2016
```
后台视频详情页增加视频信息调试链接
```
  1d503fa5
- Merge remote-tracking branch 'origin/dev' into dev · 1ba03ac0
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/main.php
```
  1ba03ac0
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 1323b164
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  1323b164
- 测试video · 489a037a
  xiabin authored Nov 01, 2016
  
  489a037a
- 修改视频时若视频需要重新审核,则提交后跳转到审核提示页 · b7f8ed91
  杨培 authored Nov 01, 2016
  
  b7f8ed91
- 后台显示 favicon · 285e8826
  杨培 authored Nov 01, 2016
  
  285e8826
- Merge remote-tracking branch 'origin/dev' into dev · 0a512b2a
  xiabin authored Nov 01, 2016
  
  0a512b2a
- 添加课堂中心的左上角 · eee55846
  xiabin authored Nov 01, 2016
  
  eee55846
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 2ed5de71
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  2ed5de71
- Merge remote-tracking branch 'origin/dev' into dev · 1cac73a7
  汪波 authored Nov 01, 2016
  
  1cac73a7
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · e62beecf
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  e62beecf
- Merge remote-tracking branch 'origin/test' into test · 794ad345
  杨培 authored Nov 01, 2016
  
  794ad345
- 修改提交课堂申请后的提示文字,并自动跳转 · bae9eb62
  杨培 authored Nov 01, 2016
  
  bae9eb62
- Merge remote-tracking branch 'origin/test' into test · 6573c249
  xiabin authored Nov 01, 2016
  
  6573c249
- 修改标题或内容后内容进入待审核状态 · be66c8fb
  杨培 authored Nov 01, 2016
```
增加多个模型数据的XSS过滤等安全性
课程富文本编辑工具栏调整
其它BUG修复
```
  be66c8fb
- 修改时长展示的问题 · 6eb94865
  xiabin authored Nov 01, 2016
  
  6eb94865
- Merge branch 'test' into dev · 27a94f59
  xiabin authored Nov 01, 2016
  
  27a94f59
- 收藏记录显示问题 · 0a74c6f9
  xiabin authored Nov 01, 2016
  
  0a74c6f9
- 修改删除讲师提示 · d6caec43
  杨培 authored Nov 01, 2016
  
  d6caec43
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · b769a357
  汪波 authored Nov 01, 2016
  
  b769a357
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · dce395f1
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  dce395f1