Commits · tag-71 · 夏彬 / zuiketang

31 Oct, 2016 23 commits
- 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
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 8245283a
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  8245283a
- Merge remote-tracking branch 'origin/dev' into dev · 25c1cfd0
  汪波 authored Oct 31, 2016
  
  25c1cfd0
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 9ac4950a
  汪波 authored Oct 31, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  9ac4950a
- 优化后台 Asset · fd015495
  杨培 authored Oct 31, 2016
  
  fd015495
28 Oct, 2016 17 commits
- Merge remote-tracking branch 'origin/dev' into dev · fc580718
  杨培 authored Oct 28, 2016
  
  fc580718
- 课堂设置 · 46d91289
  杨培 authored Oct 28, 2016
  
  46d91289
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 0db6d548
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  0db6d548
- Merge remote-tracking branch 'origin/dev' into dev · f331e229
  xiabin authored Oct 28, 2016
  
  f331e229
- 修改登录后支付的问题 · 5c50c67a
  xiabin authored Oct 28, 2016
  
  5c50c67a
- Merge remote-tracking branch 'origin/dev' into dev · 1dfa9866
  汪波 authored Oct 28, 2016
  
  1dfa9866
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 88d467be
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  88d467be
- Merge remote-tracking branch 'origin/dev' into dev · 75e6d41a
  xiabin authored Oct 28, 2016
  
  75e6d41a
- 修改登录后支付的问题 · fac78315
  xiabin authored Oct 28, 2016
  
  fac78315
- Merge remote-tracking branch 'origin/dev' into dev · a6be13c3
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/main.php
```
  a6be13c3
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 6e67b48d
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  6e67b48d
- 修改登录后支付的问题 · b99c79bd
  xiabin authored Oct 28, 2016
  
  b99c79bd
- Merge remote-tracking branch 'origin/dev' into dev · 143eca54
  杨培 authored Oct 28, 2016
  
  143eca54
- 读取视频信息部分优化,其它获取各种上传 Token 统一 · 6e1da601
  杨培 authored Oct 28, 2016
  
  6e1da601
- 修改登录后支付的问题 · 749a687e
  xiabin authored Oct 28, 2016
  
  749a687e
- 修改预览页 · 534d8c54
  xiabin authored Oct 28, 2016
  
  534d8c54
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 61a4df0a
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  61a4df0a