Commits · tag-84 · 夏彬 / zuiketang

04 Nov, 2016 6 commits
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 7cb3c9f9
  汪波 authored Nov 04, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  7cb3c9f9
- Merge remote-tracking branch 'origin/dev' into dev · c8f37931
  汪波 authored Nov 04, 2016
```
# Conflicts:
#	src/frontend/views/my-member/index.php
```
  c8f37931
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · abf506c3
  汪波 authored Nov 04, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  abf506c3
- 我的会员显示注册时间 · 8affcf00
  杨培 authored Nov 04, 2016
  
  8affcf00
- 加入计划任务 · 8ae404cb
  杨培 authored Nov 04, 2016
  
  8ae404cb
- 修改videojs映入方式 · 6a527b67
  xiabin authored Nov 04, 2016
  
  6a527b67
03 Nov, 2016 6 commits
- remove unused namespaces use. · 36969408
  杨培 authored Nov 03, 2016
  
  36969408
- 完成清理不使用的文件计划任务 · a8f32632
  杨培 authored Nov 03, 2016
  
  a8f32632
- Merge remote-tracking branch 'origin/dev' into dev · 5313d7bd
  杨培 authored Nov 03, 2016
  
  5313d7bd
- 微信API优化调整 · 6443711d
  杨培 authored Nov 03, 2016
```
完成结算计划任务
```
  6443711d
- Merge remote-tracking branch 'origin/dev' into dev · 515a1d9a
  汪波 authored Nov 03, 2016
  
  515a1d9a
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 66affc8c
  汪波 authored Nov 03, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  66affc8c
02 Nov, 2016 6 commits
- Merge remote-tracking branch 'origin/dev' into dev · f06409b3
  杨培 authored Nov 02, 2016
  
  f06409b3
- 结算计划任务开发中 · 3e5d4e09
  杨培 authored Nov 02, 2016
  
  3e5d4e09
- Merge remote-tracking branch 'origin/dev' into dev · 49e7c882
  xiabin authored Nov 02, 2016
  
  49e7c882
- 修改videojs映入方式 · 5c466b0b
  xiabin authored Nov 02, 2016
  
  5c466b0b
- 升级video.js版本 · ee0a77aa
  xiabin authored Nov 02, 2016
  
  ee0a77aa
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 3d85b94b
  汪波 authored Nov 02, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  3d85b94b
01 Nov, 2016 22 commits
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · a71d6881
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  a71d6881
- Merge remote-tracking branch 'origin/dev' into dev · 83f48491
  汪波 authored Nov 01, 2016
  
  83f48491
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · b764d9c9
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  b764d9c9
- Merge remote-tracking branch 'origin/dev' into dev · b8eb654f
  杨培 authored Nov 01, 2016
  
  b8eb654f
- 修复发布课程页面课程介绍输入提示位置错误的问题 · caaf0eb0
  杨培 authored Nov 01, 2016
  
  caaf0eb0
- Merge remote-tracking branch 'origin/dev' into dev · 1afa0d85
  汪波 authored Nov 01, 2016
  
  1afa0d85
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 81da8851
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  81da8851
- 修改微信支付的错误 · 484339d7
  xiabin authored Nov 01, 2016
  
  484339d7
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · d427f9a7
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  d427f9a7
- Merge remote-tracking branch 'origin/dev' into dev · c2b2faad
  汪波 authored Nov 01, 2016
  
  c2b2faad
- Merge branch 'dev' of http://gitlab.fingerage.com:999/xiabin/zuiketang into dev · 2407105a
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/centerHeader.php
#	src/frontend/views/layouts/main.php
```
  2407105a
- Merge branch 'test' into dev · 6a973d84
  xiabin authored Nov 01, 2016
  
  6a973d84
- 您发布的课程，无需购买可直接观看。 · 4991e79e
  xiabin authored Nov 01, 2016
  
  4991e79e
- 密码不一致 · 33fc4c8c
  xiabin authored Nov 01, 2016
  
  33fc4c8c
- 密码不一致 · 044bfe5c
  xiabin authored Nov 01, 2016
  
  044bfe5c
- 密码不一致 · 1efed9b9
  xiabin authored Nov 01, 2016
  
  1efed9b9
- Merge remote-tracking branch 'origin/dev' into dev · e0ec2da2
  xiabin authored Nov 01, 2016
  
  e0ec2da2
- 修改utils定义的方法 · 00d6c581
  xiabin authored Nov 01, 2016
  
  00d6c581
- Merge remote-tracking branch 'origin/dev' into dev · a9c57066
  杨培 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/center.php
```
  a9c57066
- Merge remote-tracking branch 'origin/dev' into dev · 9d32cd3b
  xiabin authored Nov 01, 2016
  
  9d32cd3b
- 修复视频转码时,原视频编码不一致未作为主要参数导致未正确转码的问题 · 1d503fa5
  杨培 authored Nov 01, 2016
```
后台视频详情页增加视频信息调试链接
```
  1d503fa5
- Merge remote-tracking branch 'origin/dev' into dev · 1ba03ac0
  汪波 authored Nov 01, 2016
```
# Conflicts:
#	src/frontend/views/layouts/main.php
```
  1ba03ac0