Commits · tag-64 · 夏彬 / zuiketang

26 Oct, 2016 40 commits
- Merge remote-tracking branch 'origin/dev' into dev · 0f145fad
  杨培 authored Oct 26, 2016
  
  0f145fad
- 登录时更新数据库时间 · 8e1f2852
  杨培 authored Oct 26, 2016
```
migrate 增加
```
  8e1f2852
- Merge remote-tracking branch 'origin/dev' into dev · 28aea28a
  汪波 authored Oct 26, 2016
  
  28aea28a
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 05ce4d33
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  05ce4d33
- 添加预览页连接 · 3a7eed63
  xiabin authored Oct 26, 2016
  
  3a7eed63
- 添加预览页连接 · e7163310
  xiabin authored Oct 26, 2016
  
  e7163310
- Merge remote-tracking branch 'origin/dev' into dev · 339e7a1e
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	ui/html/index-play.html
```
  339e7a1e
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 02b6d1c7
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  02b6d1c7
- Merge remote-tracking branch 'origin/dev' into dev · 7364a947
  杨培 authored Oct 26, 2016
  
  7364a947
- 登录界面修改 · 4ca17efb
  杨培 authored Oct 26, 2016
```
前台URL配置
```
  4ca17efb
- 添加预览页 · c4f8805c
  xiabin authored Oct 26, 2016
  
  c4f8805c
- 管理员登录 · 8f6a9d34
  杨培 authored Oct 26, 2016
  
  8f6a9d34
- 添加预览页 · d871017a
  xiabin authored Oct 26, 2016
  
  d871017a
- 添加视频预览页 · 2a8b3262
  xiabin authored Oct 26, 2016
  
  2a8b3262
- 添加视频预览页 · abf39edb
  xiabin authored Oct 26, 2016
  
  abf39edb
- Merge remote-tracking branch 'origin/dev' into dev · 52324520
  xiabin authored Oct 26, 2016
  
  52324520
- Merge remote-tracking branch 'origin/dev' into dev · d4bcef79
  汪波 authored Oct 26, 2016
  
  d4bcef79
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 4d28d8ff
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  4d28d8ff
- add 404 · 028f7a8a
  xiabin authored Oct 26, 2016
  
  028f7a8a
- 添加课程列表的状态 · 066dc72f
  xiabin authored Oct 26, 2016
  
  066dc72f
- Merge remote-tracking branch 'origin/dev' into dev · 98b9beca
  xiabin authored Oct 26, 2016
  
  98b9beca
- 添加课程列表的状态 · 846ee92f
  xiabin authored Oct 26, 2016
  
  846ee92f
- 视频码率参数调整 · 8a9b6ee2
  杨培 authored Oct 26, 2016
```
详情页增加一点内容
```
  8a9b6ee2
- Merge remote-tracking branch 'origin/dev' into dev · 74189245
  汪波 authored Oct 26, 2016
  
  74189245
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 352ebeb4
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  352ebeb4
- Merge remote-tracking branch 'origin/dev' into dev · e345e5a0
  杨培 authored Oct 26, 2016
  
  e345e5a0
- 视频转码部分完成 · ce6b63fb
  杨培 authored Oct 26, 2016
  
  ce6b63fb
- Merge remote-tracking branch 'origin/dev' into dev · 27948ffd
  xiabin authored Oct 26, 2016
  
  27948ffd
- Merge remote-tracking branch 'origin/dev' into dev · e222f39b
  汪波 authored Oct 26, 2016
  
  e222f39b
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 6cfd03ed
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  6cfd03ed
- 修改 · 6e34bb53
  xiabin authored Oct 26, 2016
  
  6e34bb53
- 修改 · 26129a06
  xiabin authored Oct 26, 2016
  
  26129a06
- 保存按钮后边，增加“取消”选项 · 2b87efe8
  xiabin authored Oct 26, 2016
  
  2b87efe8
- Merge remote-tracking branch 'origin/dev' into dev · 5d7872b9
  xiabin authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/web/js/my-course/components/teacher-quick-list.vue
```
  5d7872b9
- 保存按钮后边，增加“取消”选项 · dec0a70d
  xiabin authored Oct 26, 2016
  
  dec0a70d
- 找回密码第四步，成功后； · 090407cd
  xiabin authored Oct 26, 2016
```
点击 “去登录”，打开 http://c.pp.cc/site 404
地址错误。
```
  090407cd
- Merge remote-tracking branch 'origin/dev' into dev · f9d82041
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/userCenter.php
```
  f9d82041
- 直接从登录页面 http://c.pp.cc/site/login 登录时， · 4f6e62b3
  xiabin authored Oct 26, 2016
```
已开通课堂的，直接进入“课堂中心”
未开通课堂的，则进入“个人中心”
```
  4f6e62b3
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · c8cb72fa
  汪波 authored Oct 26, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  c8cb72fa
- 直接从登录页面 http://c.pp.cc/site/login 登录时， · 43ea13aa
  xiabin authored Oct 26, 2016
```
已开通课堂的，直接进入“课堂中心”
未开通课堂的，则进入“个人中心”
```
  43ea13aa