Commits · tag-73 · 夏彬 / zuiketang

01 Nov, 2016 16 commits
- 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
- 修复无法发布视频的BUG · a75d679d
  杨培 authored Nov 01, 2016
  
  a75d679d
31 Oct, 2016 24 commits
- 优化视频发布表单能用组件 · f06e2694
  杨培 authored Oct 31, 2016
  
  f06e2694
- Merge remote-tracking branch 'origin/dev' into dev · 84517679
  杨培 authored Oct 31, 2016
  
  84517679
- 优化修改视频体验和视频信息显示 · 02a13c10
  杨培 authored Oct 31, 2016
  
  02a13c10
- Merge remote-tracking branch 'origin/dev' into dev · 309cbc76
  汪波 authored Oct 31, 2016
  
  309cbc76
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 6bd70f43
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  6bd70f43
- Merge remote-tracking branch 'origin/dev' into dev · 1e8209de
  xiabin authored Oct 31, 2016
  
  1e8209de
- 昵称的10字限制没有提醒，超过10个字仍然可以输入，但保存的时候才会提示超过，但没有具体提示超过多少。 · 5a771acc
  xiabin authored Oct 31, 2016
  
  5a771acc
- 注册云涯账号的时候需要填手机验证码、密码和字母验证码，当字母验证码输入错误重新填写的时候，之前填的手机验证码和密码都要重新输入，这样容易造成手机验证码多次发送。 · 17f1a04a
  xiabin authored Oct 31, 2016
  
  17f1a04a
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 85b55116
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  85b55116
- Merge remote-tracking branch 'origin/dev' into dev · 9422b0a2
  汪波 authored Oct 31, 2016
  
  9422b0a2
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · e2f8f3be
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  e2f8f3be
- 原文字： · a855dd5a
  xiabin authored Oct 31, 2016
```
请输入6位验证码
更新为：
请输入6位短信验证码
没有获取短信动作，文字优化下，
可引导用户关注手机短信。
```
  a855dd5a
- Merge remote-tracking branch 'origin/dev' into dev · beae1ab0
  xiabin authored Oct 31, 2016
  
  beae1ab0
- Merge remote-tracking branch 'origin/test' into test · 0d7c258a
  xiabin authored Oct 31, 2016
  
  0d7c258a
- 播放前提示，没有问题。 · a8737bae
  xiabin authored Oct 31, 2016
```
开始播放时，文字要消失掉。
```
  a8737bae
- Merge remote-tracking branch 'origin/dev' into dev · 1e4f0558
  汪波 authored Oct 31, 2016
  
  1e4f0558
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · a725c4cb
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  a725c4cb
- Merge remote-tracking branch 'origin/dev' into dev · 85e453d1
  杨培 authored Oct 31, 2016
  
  85e453d1
- 后台视频审核相关修改 · c30ddb87
  杨培 authored Oct 31, 2016
  
  c30ddb87
- 试看时间在视频不可更换时不可编辑 · 2ea3bf8c
  杨培 authored Oct 31, 2016
  
  2ea3bf8c
- 可以修改未审核等状态课程的视频了 · 05b342d1
  杨培 authored Oct 31, 2016
```
发布与修改课程表单重复代码整理与优化
```
  05b342d1
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 69cce6f4
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  69cce6f4
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · ee3305a2
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  ee3305a2
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · e6bcfe25
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  e6bcfe25