1
0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-27 21:10:24 +08:00

535 Commits

Author SHA1 Message Date
koogua
e576cdefe1 前台首页部件显示增加非空判断,后台角色管理要不可编辑 2021-02-26 11:08:52 +08:00
koogua
7f3717094e 前台首页部件显示增加非空判断 2021-02-26 10:35:43 +08:00
koogua
156b28b79e 查漏补缺 2021-02-25 20:57:39 +08:00
koogua
2a0a039da6 合并dingtalk 2021-02-23 20:36:37 +08:00
koogua
1e1fed67fb Merge branch 'koogua/dingtalk-notice' into develop 2021-02-23 20:27:19 +08:00
koogua
054bccadfb 替换layui-verify为lay-verify 2021-02-23 15:37:55 +08:00
koogua
7acfaf17a9 dingtalk通知阶段提交 2021-02-22 11:38:19 +08:00
koogua
d798a5b609 dingtalk通知阶段提交 2021-02-22 11:31:21 +08:00
jacky huang
cb8684fbe0
Merge branch 'master' into develop 2021-02-18 21:43:29 +08:00
koogua
c4f1adb27f Merge branch 'develop'
# Conflicts:
#	app/Models/Course.php
#	db/migrations/schema.php
v1.2.6
2021-02-18 21:24:31 +08:00
koogua
6abca790bc 修复file_transcode 2021-02-18 21:20:23 +08:00
koogua
179f27c20a 修复file_transcode 2021-02-16 16:47:26 +08:00
koogua
41dc730651 去除beforeCreate方法中的status状态 2021-02-15 21:38:54 +08:00
koogua
bb38d90d53 去除退款延迟 2021-02-15 21:12:03 +08:00
koogua
122b4adfa8 v1.2.6预览版01 2021-02-14 21:41:38 +08:00
winzer
bc48169ff9 更新价格验证
(cherry picked from commit 3d286baf91e1c6130ebb1db7831d4bb01c8b06e8)
2021-02-13 18:35:04 +08:00
winzer
7f7636b953 增加原始价格,市场价改名为优惠价 2021-02-13 18:33:57 +08:00
winzer
a5cca0e899 使用ttl方法来取代exist判断键值是否存在 2021-02-13 18:29:46 +08:00
winzer
5d96cd0f8c 修复教师直播页面推流按钮无反应
(cherry picked from commit 098595b98178528bed674197e3feeb59a52deb95)
2021-02-13 18:28:46 +08:00
winzer
685bef5050 course和chapter增加resource_count字段
(cherry picked from commit 840457e5afcdcaf8af804f3a2e2e9c245aba8579)
2021-02-13 18:28:30 +08:00
winzer
8eef6035a8 阶段性提交积分机制-0213 2021-02-13 18:21:42 +08:00
winzer
f47091991d 阶段性提交积分机制-0204 2021-02-04 15:39:53 +08:00
winzer
3d286baf91 更新价格验证 2021-02-03 15:52:19 +08:00
winzer
491c5d3688 增加原始价格,市场价改名为优惠价 2021-02-03 15:35:23 +08:00
koogua
ed9e5f1159 !65 修复教师直播页面推流按钮无反应
Merge pull request !65 from koogua/winzer/I2WADM
2021-01-29 15:18:37 +08:00
winzer
098595b981 修复教师直播页面推流按钮无反应 2021-01-29 15:17:12 +08:00
koogua
f518a6ec34 !64 course和chapter增加resource_count字段
Merge pull request !64 from 大漠孤烟直/winzer/I2NUJN
2021-01-26 17:20:30 +08:00
winzer
840457e5af course和chapter增加resource_count字段 2021-01-26 17:13:07 +08:00
jacky huang
87db0d0569
v.1.2.5 (#21)
* 1:更新ip2region,php-cron-scheduler包
2:替换phpqrcode
3:移除lcobucci/jwt

* 后台接入产品动态,相关链接指向官网

* 升级composer依赖包

* v1.2.5阶段新合并

Co-authored-by: winzer <winzer9527@163.com>
2021-01-21 17:47:40 +08:00
koogua
ecef7838f5 !63 v1.2.5阶段性合并
Merge pull request !63 from koogua/develop
v1.2.5
2021-01-21 17:41:37 +08:00
winzer
e902c0c80f v1.2.5阶段新合并 2021-01-21 17:38:55 +08:00
koogua
4b88561604 !62 v1.2.5阶段性合并
Merge pull request !62 from koogua/develop
2021-01-19 18:55:57 +08:00
winzer
91410d60f8 升级composer依赖包 2021-01-19 18:53:27 +08:00
winzer
df3b317e44 后台接入产品动态,相关链接指向官网 2021-01-14 19:11:32 +08:00
winzer
d581c76232 1:更新ip2region,php-cron-scheduler包
2:替换phpqrcode
3:移除lcobucci/jwt
2021-01-14 19:11:29 +08:00
koogua
4d2f97ed33 !61 更新v1.2.4changelog
Merge pull request !61 from zhangshuren/develop
v1.2.4
2021-01-10 14:10:53 +08:00
koogua
c817c80273 !60 回退 'Pull Request !59 : v1.2.4阶段性合并'
Merge pull request !60 from koogua/revert-merge-59-master
2021-01-10 14:07:49 +08:00
koogua
e18cf61005 回退 'Pull Request !59 : v1.2.4阶段性合并' 2021-01-10 14:07:09 +08:00
koogua
4ed859fad9 !59 v1.2.4阶段性合并
* !58 更新v1.2.4changelog
* !56 更新v1.2.4readme
* 更新v1.2.4readme
* !55 优化api请求判断
* 增加通过http头判断是否API请求
2021-01-10 14:02:49 +08:00
zhangshuren
cd2b22c7b8 !58 更新v1.2.4changelog
* 更新v1.2.4changelog
2021-01-10 14:00:19 +08:00
winzer
ff9f577372 !57 更新v1.2.4readme
* !56 更新v1.2.4readme
* 更新v1.2.4readme
* !55 优化api请求判断
* 增加通过http头判断是否API请求
2021-01-10 13:21:05 +08:00
winzer
99c9b8e462 !56 更新v1.2.4readme
Merge pull request !56 from winzer/winzer/readme-1.2.4
2021-01-10 13:17:02 +08:00
winzer
6d9218b8ee 更新v1.2.4readme 2021-01-10 13:08:22 +08:00
koogua
a9bf09fc3e !55 优化api请求判断
Merge pull request !55 from winzer/winzer/I2CN05
2021-01-10 11:50:41 +08:00
xiaochong0302
5feacf7a49 增加通过http头判断是否API请求 2021-01-10 11:46:08 +08:00
xiaochong0302
21de7f4ad7 Merge remote-tracking branch 'remotes/github/master'
# Conflicts:
#	CHANGELOG.md
#	README.md
#	app/Http/Admin/Services/AuthNode.php
#	app/Http/Admin/Views/setting/wechat_oa.volt
#	app/Library/AppInfo.php
#	composer.lock
#	db/migrations/schema.php
2021-01-09 18:51:30 +08:00
xiaochong0302
1012d0780e Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud 2021-01-09 18:44:28 +08:00
xiaochong0302
65b8650944 Merge branch 'develop' 2021-01-09 18:42:25 +08:00
koogua
1fd957a6e2 !54 v1.2.4阶段性合并
Merge pull request !54 from koogua/develop
2021-01-09 18:26:29 +08:00
xiaochong0302
d292e8cead v1.2.4优化 2021-01-09 17:30:48 +08:00