xiaochong0302
|
3f058c3e45
|
摘除demo分支错误的合并
|
2020-12-11 20:53:54 +08:00 |
|
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 |
|
koogua
|
029de410a8
|
!23 修复添加课时后进入编辑页面500错误
* 修复添加课时后进入编辑页面500错误
|
2020-12-03 14:37:37 +08:00 |
|
koogua
|
c22c2690d6
|
update app/Http/Admin/Controllers/UploadController.php.
去除重复的signatureAction方法
|
2020-11-27 10:29:20 +08:00 |
|
xiaochong0302
|
befaccd085
|
Merge branch 'develop' of https://gitee.com/koogua/course-tencent-cloud
# Conflicts:
# CHANGELOG.md
# LICENSE
# app/Http/Home/Controllers/ChapterController.php
# app/Http/Home/Controllers/PublicController.php
# app/Library/AppInfo.php
# app/Models/Client.php
# app/Services/Logic/Chapter/BasicInfo.php
|
2020-11-27 09:47:09 +08:00 |
|
xiaochong0302
|
ac352683dd
|
删除api验证,app应用管理
|
2020-11-23 21:10:41 +08:00 |
|
koogua
|
cbc2e5762a
|
!11 阶段性合并
* 根据app需要作出相应调整
* 路由增加命名name,增加app应用管理
* 完成基本API,增加h5和小程序支付定义
|
2020-11-10 10:25:16 +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
|
2020-10-08 18:44:06 +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 |
|
koogua
|
6cd3fb6d6c
|
!2 后台运营统计合并
* 修复hash中前一日统计没有更新的问题
* 增加后台运营统计
|
2020-10-08 10:07:49 +08:00 |
|
xiaochong0302
|
ebb2c36f9f
|
后台学习资料部分完成
|
2020-10-07 18:45:50 +08:00 |
|
xiaochong0302
|
0a1c64d2b6
|
1.简化部分路由地址
2.优化账户安全以及登录页面
|
2020-09-29 18:34:47 +08:00 |
|
xiaochong0302
|
d75885e3ca
|
优化直播部分代码
|
2020-09-27 17:51:14 +08:00 |
|
xiaochong0302
|
b199368c73
|
后台auth_user->auth_info
|
2020-09-22 19:57:44 +08:00 |
|
xiaochong0302
|
3187f04b35
|
Merge branch 'develop' into demo
|
2020-09-22 16:29:41 +08:00 |
|
xiaochong0302
|
d21e70cb3c
|
优化代码
|
2020-09-22 16:29:09 +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
|
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
|
504e8e0171
|
优化代码，测试微信退款
|
2020-09-14 20:25:35 +08:00 |
|
xiaochong0302
|
502fbe9583
|
优化代码，测试微信支付
|
2020-09-13 18:19:20 +08:00 |
|
xiaochong0302
|
8a924009fa
|
Merge branch 'develop' into demo
|
2020-09-08 10:58:45 +08:00 |
|
xiaochong0302
|
7e94b95c05
|
整理代码
|
2020-09-07 15:56:28 +08:00 |
|
xiaochong0302
|
23b3c9fce0
|
增加reset_setting命令
|
2020-09-07 14:27:09 +08:00 |
|
xiaochong0302
|
c426656d12
|
禁止点播客户端上传
|
2020-09-07 10:48:19 +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
|
a6793b9e90
|
增加role初始化数据
|
2020-09-02 20:29:53 +08:00 |
|
xiaochong0302
|
477a9f1c42
|
统一了状态类型，修复一些改字段名带来的错误
|
2020-08-31 19:34:32 +08:00 |
|
xiaochong0302
|
c22417913a
|
完成直播回调
|
2020-08-30 19:56:20 +08:00 |
|
xiaochong0302
|
065b910b33
|
设计直播回调
|
2020-08-29 19:47:30 +08:00 |
|
xiaochong0302
|
1faf364d54
|
设计migration
|
2020-08-27 20:11:28 +08:00 |
|
xiaochong0302
|
56c1c851fe
|
web->desktop
|
2020-08-22 19:47:57 +08:00 |
|
xiaochong0302
|
1ec9c6f612
|
设计后台首页
|
2020-08-21 20:55:50 +08:00 |
|
xiaochong0302
|
33b24e65e7
|
优化IM,修改后台登录页
|
2020-08-20 19:52:13 +08:00 |
|
xiaochong0302
|
e40e3d9faf
|
去除了im里面的查找,后台增加im配置项,缓存归类
|
2020-08-17 21:01:51 +08:00 |
|
xiaochong0302
|
c85cc3382b
|
routes提取到config目录，增加sitemap
|
2020-08-14 20:55:39 +08:00 |
|
xiaochong0302
|
aa58ba4243
|
优化代码
|
2020-08-13 21:28:08 +08:00 |
|
xiaochong0302
|
1e2398388a
|
精简后台模板
|
2020-08-12 20:35:25 +08:00 |
|
xiaochong0302
|
343c8d49d4
|
调整category数据结构变化带来的问题
|
2020-08-11 21:50:57 +08:00 |
|
xiaochong0302
|
f1882b2892
|
slide->carousel,markdown替换
|
2020-08-08 19:48:47 +08:00 |
|
xiaochong0302
|
f589c5011a
|
优化上传，调试markdown编辑器
|
2020-08-06 20:53:30 +08:00 |
|
xiaochong0302
|
c9bf425fc6
|
教学中心完善
|
2020-08-03 20:47:35 +08:00 |
|
xiaochong0302
|
fdce89a4e7
|
完善文件上传部分
|
2020-07-29 20:43:05 +08:00 |
|
xiaochong0302
|
c88284e5b7
|
设计群组管理
|
2020-07-28 20:40:36 +08:00 |
|