Commits · tag-67 · 夏彬 / zuiketang

28 Oct, 2016 22 commits
- 修改播放事件 · 4f295e01
  xiabin authored Oct 28, 2016
  
  4f295e01
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 1c2f773a
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  1c2f773a
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 976b659b
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  976b659b
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 213f7f8a
  汪波 authored Oct 28, 2016
  
  213f7f8a
- 修改播放事件 · f15315c5
  xiabin authored Oct 28, 2016
  
  f15315c5
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 27cc54b8
  汪波 authored Oct 28, 2016
  
  27cc54b8
- 修改播放事件 · 059eefb1
  xiabin authored Oct 28, 2016
  
  059eefb1
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · dfb2ea96
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  dfb2ea96
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · cd67bdbd
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  cd67bdbd
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · f4ba0bea
  汪波 authored Oct 28, 2016
  
  f4ba0bea
- 修改播放事件 · 88358602
  xiabin authored Oct 28, 2016
  
  88358602
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · df236ad2
  汪波 authored Oct 28, 2016
  
  df236ad2
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 25e71989
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  25e71989
- Merge remote-tracking branch 'origin/dev' into dev · 9a5ddf19
  xiabin authored Oct 28, 2016
  
  9a5ddf19
- 修改播放事件 · 62f4daf2
  xiabin authored Oct 28, 2016
  
  62f4daf2
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 25c88bcb
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  25c88bcb
- Merge remote-tracking branch 'origin/dev' into dev · 09e1f72d
  杨培 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/web/js/components/uploader/avatar-upload.vue
```
  09e1f72d
- 讲师上传头像可以不断上传 · 2ca46b35
  杨培 authored Oct 28, 2016
```
Token 变更
发布课程必须设置价格等
```
  2ca46b35
- Merge remote-tracking branch 'origin/dev' into dev · 808c58e5
  xiabin authored Oct 28, 2016
  
  808c58e5
- 修改播放事件 · d859c5f2
  xiabin authored Oct 28, 2016
  
  d859c5f2
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 0672bf7e
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  0672bf7e
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · f6452886
  汪波 authored Oct 28, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  f6452886
27 Oct, 2016 18 commits
- 增加一个秒数转换函数 · 20d18a02
  杨培 authored Oct 27, 2016
```
发布视频增加价格验证,必须输入价格
```
  20d18a02
- Merge remote-tracking branch 'origin/dev' into dev · 1e65a677
  汪波 authored Oct 27, 2016
  
  1e65a677
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · bc7fcbbd
  汪波 authored Oct 27, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  bc7fcbbd
- 修改播放事件 · 870d754e
  xiabin authored Oct 27, 2016
  
  870d754e
- 修改utils · 4b80a764
  xiabin authored Oct 27, 2016
  
  4b80a764
- 修改utils · 41c08c63
  xiabin authored Oct 27, 2016
  
  41c08c63
- Merge remote-tracking branch 'origin/dev' into dev · a5c44bac
  xiabin authored Oct 27, 2016
  
  a5c44bac
- 添加视频观看完后提示 · 33f4959e
  xiabin authored Oct 27, 2016
  
  33f4959e
- Merge remote-tracking branch 'origin/dev' into dev · ba182ce0
  汪波 authored Oct 27, 2016
  
  ba182ce0
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 8826a3d2
  汪波 authored Oct 27, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  8826a3d2
- 添加视频观看完后提示 · b98e673c
  xiabin authored Oct 27, 2016
  
  b98e673c
- 讲师列表页介绍信息显示纯文本 · 3e840e26
  杨培 authored Oct 27, 2016
  
  3e840e26
- 修改注册 · e3193e1d
  xiabin authored Oct 27, 2016
  
  e3193e1d
- Merge remote-tracking branch 'origin/dev' into dev · f25ecb9a
  汪波 authored Oct 27, 2016
  
  f25ecb9a
- Merge remote-tracking branch 'origin/dev' into dev · 35afeaf7
  杨培 authored Oct 27, 2016
  
  35afeaf7
- 课程列表功能完善 · cda050d2
  杨培 authored Oct 27, 2016
```
课堂申请错误统一
```
  cda050d2
- 修改支付后的弹窗问题 · fd4faf86
  xiabin authored Oct 27, 2016
  
  fd4faf86
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · aed6c193
  汪波 authored Oct 27, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  aed6c193