xiaochong0302
|
6fa30310dd
|
Merge branch 'develop' of https://gitee.com/koogua/course-tencent-cloud into demo
# Conflicts:
# CHANGELOG.md
# app/Http/Home/Controllers/ChapterController.php
# app/Library/AppInfo.php
# app/Services/Logic/Chapter/BasicInfo.php
|
2020-11-23 21:28:30 +08:00 |
|
xiaochong0302
|
9e3cd93599
|
Merge remote-tracking branch 'github/develop' into develop
|
2020-11-23 21:16:03 +08:00 |
|
xiaochong0302
|
ac352683dd
|
删除api验证,app应用管理
|
2020-11-23 21:10:41 +08:00 |
|
xiaochong0302
|
27b3dc1935
|
删除api验证,app应用管理
|
2020-11-23 21:05:14 +08:00 |
|
xiaochong0302
|
70886569d1
|
优化代码
|
2020-11-19 21:26:01 +08:00 |
|
xiaochong0302
|
10c43d0ab3
|
调整直播部分结构
|
2020-11-15 18:26:35 +08:00 |
|
xiaochong0302
|
a59ab3c6d8
|
优化点播直播部分代码
|
2020-11-12 20:50:01 +08:00 |
|
xiaochong0302
|
3ce6897de1
|
优化点播直播部分代码
|
2020-11-11 20:39:49 +08:00 |
|
xiaochong0302
|
f4dda5a58c
|
修复退款项目空白,以及弹窗高度自适应,取消退款内部错误
|
2020-11-10 16:21:11 +08:00 |
|
koogua
|
09a131c6fe
|
!14 修正点击退款404
* 修复退款项目空白,以及弹窗高度自适应,取消退款内部错误
|
2020-11-10 16:19:54 +08:00 |
|
xiaochong0302
|
7453a1448a
|
修复退款项目空白,以及弹窗高度自适应
|
2020-11-10 15:01:56 +08:00 |
|
koogua
|
8dd496ab2a
|
!13 修正退款项目空白以及弹窗自适应
* 修复退款项目空白,以及弹窗高度自适应
|
2020-11-10 14:58:59 +08:00 |
|
xiaochong0302
|
5877874d64
|
修复退款项目空白,以及弹窗高度自适应
|
2020-11-10 14:44:48 +08:00 |
|
koogua
|
7c92b0315a
|
!12 修正退款项目空白以及弹窗自适应
* 修复退款项目空白,以及弹窗高度自适应
|
2020-11-10 14:36:41 +08:00 |
|
xiaochong0302
|
6ca3e99599
|
Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud
|
2020-11-10 10:51:01 +08:00 |
|
koogua
|
cbc2e5762a
|
!11 阶段性合并
* 根据app需要作出相应调整
* 路由增加命名name,增加app应用管理
* 完成基本API,增加h5和小程序支付定义
|
2020-11-10 10:25:16 +08:00 |
|
koogua
|
823e47f6b2
|
!10 命令行工具rebuild_index_course_cache增加type=simple逻辑
Merge pull request !10 from koogua/koogua/I1Y8EB
|
2020-10-30 19:13:14 +08:00 |
|
koogua
|
f318fccada
|
!9 修正插入数据不一致以及后台菜单参数类型报错
* 1.修正插入的管理帐号数据
* 纠正迁移文件和时间代码中字段不一致
* 更新版本号
* 完善后台今日统计,增加权限白名单,增加后台首页菜单,调整后台登录页样式
* Merge branch 'koogua/I1XFCF' of https://gitee.com/koogua/course-tencen…
* 前台学习资料部分完成
* !2 后台运营统计合并
* 后台学习资料部分完成
* Merge branch 'master' into develop
* Merge branch 'master' of https://github.com/xiaochong0302/course-tencent-cloud
* 1.增加changelog.md
* 1.简化部分路由地址
* Merge pull request #2 from xiaochong0302/dependabot/composer/symfony/h…
* Bump symfony/http-foundation from 4.3.4 to 5.1.6
|
2020-10-26 20:09:31 +08:00 |
|
koogua
|
d6a43e816b
|
!8 修正插入数据不一致以及后台菜单参数类型报错
Merge pull request !8 from koogua/koogua/I22LSW
|
2020-10-26 20:06:01 +08:00 |
|
xiaochong0302
|
ee20552eeb
|
1.修正插入的管理帐号数据
2.修正参数类型报错
|
2020-10-26 19:59:46 +08:00 |
|
xiaochong0302
|
cdc174acdc
|
增加index_tpl_type=simple时重建缓存的支持
|
2020-10-14 09:57:45 +08:00 |
|
xiaochong0302
|
de2a71415e
|
demo后台增加统计
|
2020-10-13 17:58:11 +08:00 |
|
jacky huang
|
2da5f09644
|
Merge pull request #5 from xiaochong0302/develop
纠正迁移文件和时间代码中字段不一致
|
2020-10-13 11:46:07 +08:00 |
|
koogua
|
0f6345e5da
|
!7 纠正迁移文件和代码实际使用字段不一致
* 纠正迁移文件和时间代码中字段不一致
* 更新版本号
* 完善后台今日统计,增加权限白名单,增加后台首页菜单,调整后台登录页样式
* Merge branch 'koogua/I1XFCF' of https://gitee.com/koogua/course-tencen…
* 前台学习资料部分完成
* !2 后台运营统计合并
* 后台学习资料部分完成
* Merge branch 'master' into develop
* Merge branch 'master' of https://github.com/xiaochong0302/course-tencent-cloud
* 1.增加changelog.md
* 1.简化部分路由地址
* Merge pull request #2 from xiaochong0302/dependabot/composer/symfony/h…
* Bump symfony/http-foundation from 4.3.4 to 5.1.6
|
2020-10-13 10:24:40 +08:00 |
|
xiaochong0302
|
034a6803f0
|
Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud
|
2020-10-13 10:16:45 +08:00 |
|
xiaochong0302
|
87f6744827
|
纠正迁移文件和时间代码中字段不一致
|
2020-10-13 10:12:57 +08:00 |
|
jacky huang
|
7f2895b2be
|
Merge pull request #3 from xiaochong0302/develop
Develop
|
2020-10-09 11:13:40 +08:00 |
|
koogua
|
a7f197c01b
|
!6 develop->master 1.1.0
* 更新版本号
* 完善后台今日统计,增加权限白名单,增加后台首页菜单,调整后台登录页样式
* Merge branch 'koogua/I1XFCF' of https://gitee.com/koogua/course-tencen…
* 前台学习资料部分完成
* !2 后台运营统计合并
* 后台学习资料部分完成
* Merge branch 'master' into develop
* Merge branch 'master' of https://github.com/xiaochong0302/course-tencent-cloud
* 1.增加changelog.md
* 1.简化部分路由地址
* Merge pull request #2 from xiaochong0302/dependabot/composer/symfony/h…
* Bump symfony/http-foundation from 4.3.4 to 5.1.6
v1.1.0
|
2020-10-08 18:44:06 +08:00 |
|
koogua
|
cff2d5564e
|
!5 更新版本号1.1.0
* 更新版本号
* 完善后台今日统计,增加权限白名单,增加后台首页菜单,调整后台登录页样式
* Merge branch 'koogua/I1XFCF' of https://gitee.com/koogua/course-tencen…
* 前台学习资料部分完成
* !2 后台运营统计合并
* 后台学习资料部分完成
|
2020-10-08 18:41:07 +08:00 |
|
xiaochong0302
|
ffebcfa1fe
|
更新版本号
|
2020-10-08 18:38:18 +08:00 |
|
koogua
|
2f119c65e8
|
!4 v1.1.0版本develop->demo
* 完善后台今日统计,增加权限白名单,增加后台首页菜单,调整后台登录页样式
* Merge branch 'koogua/I1XFCF' of https://gitee.com/koogua/course-tencen…
* 前台学习资料部分完成
* !2 后台运营统计合并
* 后台学习资料部分完成
|
2020-10-08 17:20:43 +08:00 |
|
xiaochong0302
|
5784be5067
|
完善后台今日统计,增加权限白名单,增加后台首页菜单,调整后台登录页样式
|
2020-10-08 17:17:10 +08:00 |
|
xiaochong0302
|
cc1c663917
|
Merge branch 'koogua/I1XFCF' of https://gitee.com/koogua/course-tencent-cloud into develop
Conflicts:
db/migrations/schema.php
|
2020-10-08 16:09:13 +08:00 |
|
xiaochong0302
|
6b8baae6b3
|
前台学习资料部分完成
|
2020-10-08 15:33:39 +08:00 |
|
koogua
|
6cd3fb6d6c
|
!2 后台运营统计合并
* 修复hash中前一日统计没有更新的问题
* 增加后台运营统计
|
2020-10-08 10:07:49 +08:00 |
|
xiaochong0302
|
ebb2c36f9f
|
后台学习资料部分完成
|
2020-10-07 18:45:50 +08:00 |
|
xiaochong0302
|
673eba24e1
|
Merge branch 'develop' into demo
|
2020-09-30 17:46:57 +08:00 |
|
xiaochong0302
|
b987ddf083
|
Merge branch 'master' into develop
|
2020-09-30 17:45:31 +08:00 |
|
xiaochong0302
|
4e98c3abeb
|
Merge branch 'master' of https://github.com/xiaochong0302/course-tencent-cloud
|
2020-09-30 17:41:20 +08:00 |
|
xiaochong0302
|
88684c4d71
|
1.增加changelog.md
2.修复后台学习记录客户端枚举值
|
2020-09-30 17:32:22 +08:00 |
|
xiaochong0302
|
ab5b416ec9
|
1.增加changelog.md
2.修复后台学习记录客户端枚举值
|
2020-09-30 17:31:34 +08:00 |
|
xiaochong0302
|
8cc06f6430
|
Merge branch 'develop' into demo
|
2020-09-29 18:36:21 +08:00 |
|
xiaochong0302
|
0a1c64d2b6
|
1.简化部分路由地址
2.优化账户安全以及登录页面
|
2020-09-29 18:34:47 +08:00 |
|
jacky huang
|
a6505c45a7
|
Merge pull request #2 from xiaochong0302/dependabot/composer/symfony/http-foundation-5.1.6
Bump symfony/http-foundation from 4.3.4 to 5.1.6
|
2020-09-29 09:45:11 +08:00 |
|
dependabot[bot]
|
fea36d591e
|
Bump symfony/http-foundation from 4.3.4 to 5.1.6
Bumps [symfony/http-foundation](https://github.com/symfony/http-foundation) from 4.3.4 to 5.1.6.
- [Release notes](https://github.com/symfony/http-foundation/releases)
- [Changelog](https://github.com/symfony/http-foundation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/http-foundation/compare/v4.3.4...v5.1.6)
Signed-off-by: dependabot[bot] <support@github.com>
|
2020-09-28 03:41:38 +00:00 |
|
koogua
|
efc8bb317e
|
add LICENSE.
|
2020-09-27 18:14:57 +08:00 |
|
xiaochong0302
|
cf239e70a0
|
Merge branch 'develop' into demo
|
2020-09-27 17:59:13 +08:00 |
|
xiaochong0302
|
bfe66b00d0
|
Merge branch 'develop'
# Conflicts:
# LICENSE
v1.0.0-beta1
|
2020-09-27 17:53:23 +08:00 |
|
xiaochong0302
|
57f84e3ad9
|
Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud
|
2020-09-27 17:51:59 +08:00 |
|
xiaochong0302
|
d75885e3ca
|
优化直播部分代码
|
2020-09-27 17:51:14 +08:00 |
|