Commits · tag-62 · 夏彬 / zuiketang

26 Oct, 2016 9 commits
- 防止误操作，在上传过程中关闭页面。 · af24c146
  xiabin authored Oct 26, 2016
  
  af24c146
- 防止误操作，在上传过程中关闭页面。 · 556b8107
  xiabin authored Oct 26, 2016
  
  556b8107
- 无论在，首页、内容页 · 8a84f514
  xiabin authored Oct 26, 2016
```
点击左上角“课堂名称 logo”时，不要进入后台；
均进入该课堂的首页。
```
  8a84f514
- 添加退出登录按钮的跳转 · 4228b7f4
  xiabin authored Oct 26, 2016
  
  4228b7f4
- 修改video · 65344e88
  xiabin authored Oct 26, 2016
  
  65344e88
- 修改video · 4af0645e
  xiabin authored Oct 26, 2016
  
  4af0645e
- Merge remote-tracking branch 'origin/dev' into dev · 59a50601
  汪波 authored Oct 26, 2016
  
  59a50601
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · a323f662
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  a323f662
- 修改视频直播的位置 · 6df3a0b2
  xiabin authored Oct 26, 2016
  
  6df3a0b2
25 Oct, 2016 15 commits
- Merge remote-tracking branch 'origin/dev' into dev · 1d2d4565
  杨培 authored Oct 25, 2016
  
  1d2d4565
- 课程审核基础功能完成,剩余转码部分。 · 05d5f8c3
  杨培 authored Oct 25, 2016
```
转码功能开发中。
数据表调整
```
  05d5f8c3
- Merge remote-tracking branch 'origin/dev' into dev · 7c137d0e
  汪波 authored Oct 25, 2016
  
  7c137d0e
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 4fd94352
  汪波 authored Oct 25, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  4fd94352
- 添加验证器课堂名称不允许出现“云涯”二字。 · a72f7b1e
  xiabin authored Oct 25, 2016
  
  a72f7b1e
- Merge remote-tracking branch 'origin/dev' into dev · 38b66a0a
  杨培 authored Oct 25, 2016
  
  38b66a0a
- 解决上传图头像一致性的问题 · 3c72a78b
  xiabin authored Oct 25, 2016
  
  3c72a78b
- 修改样式 · b7e733af
  汪波 authored Oct 25, 2016
  
  b7e733af
- 进入我的课堂后，默认首页就是 “课堂概况”。 · 3d8f303b
  xiabin authored Oct 25, 2016
```
目前是空白
```
  3d8f303b
- 讲师介绍，需要有个简易版的编辑器。 · 8d460662
  xiabin authored Oct 25, 2016
```
需要支持以下功能：
加粗，倾斜，下划线，字体颜色，有序列表，无需列表
```
  8d460662
- 完成后台的课堂管理 · faad91f6
  杨培 authored Oct 25, 2016
  
  faad91f6
- 承载页 title 规范 · 2ad0080d
  xiabin authored Oct 25, 2016
  
  2ad0080d
- 会员列表的 “首次购买” 与购买记录的 “课程” · 36ea1e2b
  xiabin authored Oct 25, 2016
```
均加上对应课程的链接。
```
  36ea1e2b
- 重新修改上传头像为vue · ad9b9f9b
  xiabin authored Oct 25, 2016
  
  ad9b9f9b
- 修改头像上传组件 · 74fdee66
  xiabin authored Oct 25, 2016
  
  74fdee66
24 Oct, 2016 16 commits
- Merge remote-tracking branch 'origin/dev' into dev · da50ffa2
  杨培 authored Oct 24, 2016
  
  da50ffa2
- Merge remote-tracking branch 'origin/test' into test · e756e2d8
  杨培 authored Oct 24, 2016
```
# Conflicts:
#	src/common/models/Classes.php
```
  e756e2d8
- 后台界面 · 5c616ff0
  杨培 authored Oct 24, 2016
```
课堂管理和审核
```
  5c616ff0
- 后台界面 · 554e2595
  杨培 authored Oct 24, 2016
```
课堂管理和审核
```
  554e2595
- 修改user-center连接 · 31ea8c1b
  xiabin authored Oct 24, 2016
  
  31ea8c1b
- 修改分享的配置问题 · 00fd0b64
  xiabin authored Oct 24, 2016
  
  00fd0b64
- 修改支付标题 · f210652e
  xiabin authored Oct 24, 2016
  
  f210652e
- 修改flv的支持 · 751ff76d
  xiabin authored Oct 24, 2016
  
  751ff76d
- 修改flv的支持 · 37c6aa86
  xiabin authored Oct 24, 2016
  
  37c6aa86
- 优化imports · c736f7e1
  xiabin authored Oct 24, 2016
  
  c736f7e1
- 添加支持flv播放 · e43dadcb
  xiabin authored Oct 24, 2016
  
  e43dadcb
- 添加支持flv播放 · 25eb772c
  xiabin authored Oct 24, 2016
  
  25eb772c
- 修改配置 · 21ca5cd2
  xiabin authored Oct 24, 2016
  
  21ca5cd2
- 修改配置 · bf1b0acc
  xiabin authored Oct 24, 2016
  
  bf1b0acc
- 添加讲师头像转换 · c3b1e5b6
  xiabin authored Oct 24, 2016
  
  c3b1e5b6
- 还原teacher · fee6bd67
  xiabin authored Oct 24, 2016
  
  fee6bd67