koogua
|
3eb2216dac
|
!47 v1.2.1阶段性合并
* Merge branch 'master' of gitee.com:koogua/course-tencent-cloud into develop
* Merge branch 'demo' of gitee.com:koogua/course-tencent-cloud into develop
* Merge remote-tracking branch 'github/develop' into develop
* Merge branch 'develop' of https://gitee.com/koogua/course-tencent-clou…
* 更改QQ登录获取ACCESS_TOKEN的请求方式
* Merge branch 'master' into develop
* Merge branch 'master' of gitee.com:koogua/course-tencent-cloud into develop
* !44 v1.2.1阶段性合并
* 优化开发登录逻辑
* v1.2.1阶段性合并 (#13)
* !43 v1.2.0阶段性合并
* Merge branches 'develop' and 'master' of https://gitee.com/koogua/cour…
* 优化开发登录，计划任务执行路径，周期
* !41 修复课程分类未过滤2
* !39 修复课程分类未过滤
* Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud into demo
* Merge branch 'master' of https://gitee.com/koogua/course-tencent-cloud…
* Merge branch 'develop' of https://gitee.com/koogua/course-tencent-clou…
* 优化第三方登录，修复注册密码加密问题
* !33 开放登录阶段性合并
* Merge branch 'xiaochong0302/I280IZ' of https://gitee.com/koogua/course…
* Merge remote-tracking branch 'gitee/xiaochong0302/I280IZ' into xiaocho…
* 初步完成开放登录，待线上测试7
* !31 开放登录线上测试6
* Merge branch 'demo' of gitee.com:koogua/course-tencent-cloud into xiao…
* 初步完成开放登录，待线上测试6
* !30 开放登录线上测试5
* !29 开放登录线上测试5
* 初步完成开放登录，待线上测试5
* !28 开放登录线上测试4
* 初步完成开放登录，待线上测试4
* !27 开放登录线上测试3
* 初步完成开放登录，待线上测试3
* !26 开放登录线上测试2
* 初步完成开放登录，待线上测试2
* !25 开放登录线上测试
* 初步完成开放登录，待线上测试
* !24 修复添加课时后进入编辑页面500错误
* !22 验证更新h5支付
* 更新H5支付方式
* Merge remote-tracking branch 'remotes/gitee/develop' into demo
* 更新H5支付方式
* !20 验证更新h5支付
* 更新H5支付方式
* v1.2.0阶段性合并 (#11)
* Merge remote-tracking branch 'remotes/gitee/master' into develop
* Merge pull request #10 from xiaochong0302/develop
* Merge branch 'develop' of https://gitee.com/koogua/course-tencent-clou…
* 增加微信H5支付需要的Referer头信息
* Merge pull request #8 from xiaochong0302/develop
* !16 v1.2.0阶段性合并
* 删除调试断点代码
* 删除重复的signature方法
* Merge branch 'develop' of https://gitee.com/koogua/course-tencent-clou…
* demo后台增加统计
* Merge pull request #5 from xiaochong0302/develop
* Merge pull request #3 from xiaochong0302/develop
* !5 更新版本号1.1.0
* !4 v1.1.0版本develop->demo
* Merge branch 'develop' into demo
* 1.增加changelog.md
* Merge branch 'develop' into demo
* Merge branch 'develop' into demo
* Merge branch 'develop' into demo
* !1 精简优化代码
* Merge branch 'develop' into demo
* 合并修改
|
2020-12-10 15:52:34 +08:00 |
|
koogua
|
78bbfd3577
|
!42 v1.2.1阶段性合并
* 计划任务执行路径，周期
* !39 修复课程分类未过滤
* 优化第三方登录，修复注册密码加密问题
* !33 开放登录阶段性合并
* !24 修复添加课时后进入编辑页面500错误
|
2020-12-09 18:02:39 +08:00 |
|
xiaochong0302
|
b199368c73
|
后台auth_user->auth_info
|
2020-09-22 19:57:44 +08:00 |
|
xiaochong0302
|
8f6c3eb3e5
|
新增课时资源结构
|
2020-09-22 19:31:44 +08:00 |
|
xiaochong0302
|
e4bf021203
|
优化demo分支过滤私密配置
|
2020-09-22 16:35:19 +08:00 |
|
xiaochong0302
|
e22082f28f
|
Merge branch 'develop' into demo
|
2020-09-22 08:35:42 +08:00 |
|
xiaochong0302
|
1f2a5d959b
|
修复demo分支登录后台验证码不出现错误
|
2020-09-22 08:35:23 +08:00 |
|
xiaochong0302
|
2baf88f1d3
|
合并develop分支
|
2020-09-17 21:34:35 +08:00 |
|
xiaochong0302
|
2b749c7d5c
|
Merge branch 'develop' into demo
|
2020-09-17 21:31:48 +08:00 |
|
xiaochong0302
|
cddbc08c0b
|
优化命名
|
2020-09-17 21:29:29 +08:00 |
|
xiaochong0302
|
8a924009fa
|
Merge branch 'develop' into demo
|
2020-09-08 10:58:45 +08:00 |
|
xiaochong0302
|
d21c0d72e5
|
整理代码
|
2020-09-08 10:55:36 +08:00 |
|
xiaochong0302
|
387503c218
|
Merge branch 'develop' into demo
# Conflicts:
# app/Http/Admin/Controllers/SettingController.php
# app/Http/Admin/Services/Setting.php
# db/migrations/20200827112717_insert_setting_data.php
|
2020-09-07 10:26:21 +08:00 |
|
xiaochong0302
|
a0770f6fcd
|
整理清除数据万象后的调整
|
2020-09-06 20:11:51 +08:00 |
|
xiaochong0302
|
5d03891d4d
|
合并demo分支的修改
|
2020-09-04 17:49:08 +08:00 |
|
xiaochong0302
|
aab8d7a8f2
|
demo分支过滤敏感数据以及限制提交
|
2020-09-04 17:33:16 +08:00 |
|
xiaochong0302
|
fcfb8aaec3
|
更新readme
|
2020-09-03 17:59:12 +08:00 |
|
xiaochong0302
|
065b910b33
|
设计直播回调
|
2020-08-29 19:47:30 +08:00 |
|
xiaochong0302
|
d1c9dfa46f
|
后台Config->Setting
|
2020-04-10 19:27:46 +08:00 |
|