1
0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-26 12:23:06 +08:00

197 Commits

Author SHA1 Message Date
koogua
7322594aca Merge branch 'koogua/v1.5.1' into demo 2022-03-13 17:06:23 +08:00
koogua
4345bdeb26 v1.5.1 beta 2022-03-13 17:05:35 +08:00
koogua
891d2281d3 Merge branch 'develop' into demo 2022-02-17 11:09:39 +08:00
koogua
0155e55e4b 功能优化 2022-01-18 18:03:48 +08:00
koogua
10a2d3ed14 Merge branch 'develop' into demo 2022-01-13 11:02:22 +08:00
koogua
6e90d04da9 v1.5.0 2022-01-13 11:01:06 +08:00
koogua
6b870836f9 Merge branch 'ctc/v1.4.8' into demo 2021-11-28 17:24:55 +08:00
koogua
e7abda6daf v1.4.8 2021-11-28 17:24:03 +08:00
koogua
113002fb5f Merge branch 'koogua/v1.4.5' into demo 2021-10-06 17:03:12 +08:00
koogua
d94001a4a4 1.去除模型中删除关联发布操作
2.整理查询逻辑
2021-10-06 17:01:49 +08:00
koogua
5a62e0b2f3 Merge branch 'koogua/v1.4.5' into demo
# Conflicts:
#	app/Http/Home/Views/account/login_by_password.volt
2021-09-22 21:50:53 +08:00
koogua
c7c9ab4f59 v1.4.5 beta3 2021-09-22 21:48:49 +08:00
koogua
a509dae908 Merge branch 'koogua/v1.4.4' into demo 2021-09-07 17:30:09 +08:00
koogua
b9d78da1ce v1.4.4 preview 2021-09-07 17:29:23 +08:00
koogua
b842649fd0 更新重置演示直播课程逻辑 2021-08-28 21:57:45 +08:00
koogua
797ba8d64a Merge branch 'koogua/v1.4.2' into demo 2021-08-12 16:26:37 +08:00
koogua
de7fd43cd4 v1.4.2 beta1 2021-08-12 16:26:00 +08:00
koogua
e3e1e3dab7 Merge branch 'koogua/v1.3.9' into demo
# Conflicts:
#	app/Library/AppInfo.php
2021-07-23 15:43:06 +08:00
koogua
8d43d27523 v1.3.9 beta 2021-07-23 15:10:55 +08:00
koogua
c0ed73c271 Merge branch 'koogua/v1.3.8' into demo
# Conflicts:
#	app/Http/Admin/Views/public/login.volt
#	app/Http/Home/Views/account/login_by_password.volt
2021-07-10 21:52:37 +08:00
koogua
9b22fd6656 清理无用文件,处理记录逻辑删除后的浏览问题 2021-07-10 21:48:49 +08:00
koogua
9025a84536 Merge branch 'koogua/v1.3.7' into demo 2021-06-13 15:51:22 +08:00
koogua
0336a54911 1.源文件增加版权信息
2.群组状态和课程协同
2021-06-13 15:49:47 +08:00
koogua
1d2f1dd266 1.更改模块继承基类
2.升级layui到2.6.8
3.升级腾讯云播放器
4.点播增加外链支持
2021-06-12 12:34:40 +08:00
koogua
aec585d0b7 Merge branch 'koogua/v1.3.6' into demo
# Conflicts:
#	app/Models/Role.php
2021-06-01 12:48:52 +08:00
koogua
92c2225d47 v1.3.6阶段提交 2021-06-01 12:44:15 +08:00
koogua
f77d9b475d Merge branch 'koogua/1.3.4-fixed' into demo 2021-05-13 18:45:50 +08:00
koogua
1a15ad58c9 阶段提交 2021-05-13 17:50:39 +08:00
koogua
38b2fecbe9 Merge branch 'koogua/v1.3.4' into demo
# Conflicts:
#	scheduler.php
2021-05-12 20:46:27 +08:00
koogua
661034f3c1 阶段提交 2021-05-10 21:35:07 +08:00
koogua
caa34d2675 v1.3.4阶段提交 2021-05-07 19:34:31 +08:00
koogua
f0f32fbb7c Merge branch 'koogua/I3NB2Q' into demo 2021-04-28 20:43:21 +08:00
koogua
f05ad4bb67 v1.3.3 preview 2021-04-28 20:40:18 +08:00
koogua
eec153edbe Merge branch 'koogua/v1.3.1' into demo 2021-04-10 18:41:38 +08:00
koogua
0f673dff3f 增加开启和关闭站点终端命令 2021-04-10 16:05:13 +08:00
koogua
a03dc6d626 Merge branch 'koogua/v1.3.1' into demo 2021-04-10 12:24:18 +08:00
koogua
c5ef9a2b2d 专栏阶段性提交2 2021-04-09 17:35:31 +08:00
koogua
2310c1d3ca Merge branch 'koogua/I3CC5N' into demo 2021-03-26 15:15:59 +08:00
koogua
6c86f914cc 增加面授模型,重构群组成员管理 2021-03-26 15:15:37 +08:00
koogua
13324d2cc1 Merge branch 'koogua/I2EJHG' into demo 2021-03-20 16:06:22 +08:00
koogua
47e03cd82b 优化 2021-03-20 15:59:24 +08:00
koogua
88bdab6936 秒杀功能+优化 2021-03-18 20:12:27 +08:00
koogua
f1aaaacdaf Merge branch 'koogua/I3A937' into demo 2021-03-07 15:34:25 +08:00
koogua
d7d47e6c8f 增加手续费逻辑 2021-03-06 18:28:21 +08:00
koogua
2451aa3c00 更新演示帐号 2021-03-05 18:59:35 +08:00
koogua
599e54f745 Merge branch 'koogua/I399X5' into demo
# Conflicts:
#	app/Services/Auth/Api.php
#	app/Services/Auth/Home.php
2021-03-03 18:07:51 +08:00
koogua
6b75756d97 Merge branch 'koogua/I399X5' into develop 2021-03-03 17:53:31 +08:00
koogua
1ebe649236 Merge branch 'koogua/hotfix-user-cache' into demo 2021-03-03 11:34:35 +08:00
koogua
cb09e62649 1.修正购买vip时没有设置vip=1的错误
2.getCurrentUser,getLoginUser增加缓存选项
2021-03-03 11:33:48 +08:00
koogua
86c66baece 整理通知相关以及deleted字段相关 2021-03-02 19:57:57 +08:00