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

166 Commits

Author SHA1 Message Date
koogua
a00b1335e1 Merge branch 'koogua/I3IREK' into demo 2021-04-15 10:54:56 +08:00
koogua
005e7df57b 修复轮播图无法保存数据 2021-04-14 15:01:54 +08:00
koogua
eeb25c0913 Merge branch 'koogua/v1.3.1' into demo 2021-04-10 15:09:00 +08:00
koogua
8fdf9a77df xs.article.ini加入忽略 2021-04-10 15:08:04 +08:00
koogua
a03dc6d626 Merge branch 'koogua/v1.3.1' into demo 2021-04-10 12:24:18 +08:00
koogua
35294379e3 Merge branch 'koogua/I3EBEO' into koogua/v1.3.1
# Conflicts:
#	app/Services/Logic/Consult/ConsultLike.php
#	app/Services/Logic/Review/ReviewLike.php
#	app/Services/Logic/User/Console/FavoriteList.php
#	app/Services/Logic/User/FavoriteList.php
2021-04-09 17:56:15 +08:00
koogua
c5ef9a2b2d 专栏阶段性提交2 2021-04-09 17:35:31 +08:00
koogua
d98b936969 专栏阶段性提交 2021-04-08 19:58:30 +08:00
koogua
51899d8c81 修正file_transcode 2021-03-30 20:07:54 +08:00
koogua
19d068844d 修正im头像路径 2021-03-26 15:23:55 +08:00
koogua
0c964b85a6 修正im头像路径 2021-03-26 15:23:08 +08:00
koogua
f6ff5db852 Merge branch 'koogua/I3CC5N'
# Conflicts:
#	app/Models/ImGroup.php
#	app/Models/ImUser.php
2021-03-26 15:20:35 +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
4e69f1b43e 修正chapter attrs字段序列化问题 2021-03-23 10:43:15 +08:00
koogua
8849f706b9 修正IM用户和群组头像问题 2021-03-22 16:08:16 +08:00
koogua
997825d97e Merge branch 'koogua/v1.2.9' into demo 2021-03-20 17:35:05 +08:00
koogua
3bb613b2b3 修正封面问题 2021-03-20 17:34:20 +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
c62a1b6d42 Merge branch 'koogua/I39Y6L' into demo 2021-03-07 15:34:20 +08:00
koogua
13db91fdda Merge branch 'koogua/I39Y6Y' into demo 2021-03-07 15:34:10 +08:00
koogua
e51d44f5ea Merge branch 'koogua/I39Y6L' into develop 2021-03-07 15:30:12 +08:00
koogua
64dc731b23 会员期限价格等可设置 2021-03-04 20:44:56 +08:00
koogua
b0112cafce 增加不可退款选项 2021-03-04 16:35:01 +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
9d4225f663 整理migration 2021-03-03 17:29:27 +08:00
koogua
86c66baece 整理通知相关以及deleted字段相关 2021-03-02 19:57:57 +08:00
koogua
a091ff541e Merge branch 'koogua/v1.2.7' into demo 2021-02-26 15:22:21 +08:00
koogua
156b28b79e 查漏补缺 2021-02-25 20:57:39 +08:00
koogua
90581c4119 Merge branch 'koogua/dingtalk-notice' into demo
# Conflicts:
#	scheduler.php
2021-02-23 20:29:26 +08:00
koogua
1e1fed67fb Merge branch 'koogua/dingtalk-notice' into develop 2021-02-23 20:27:19 +08:00
koogua
c4f218ea84 dingtalk通知阶段提交 2021-02-22 11:40:16 +08:00
koogua
7acfaf17a9 dingtalk通知阶段提交 2021-02-22 11:38:19 +08:00
koogua
d798a5b609 dingtalk通知阶段提交 2021-02-22 11:31:21 +08:00
koogua
6abca790bc 修复file_transcode 2021-02-18 21:20:23 +08:00
koogua
41dc730651 去除beforeCreate方法中的status状态 2021-02-15 21:38:54 +08:00
koogua
879333adab 去除beforeCreate方法中的status状态 2021-02-15 21:37:32 +08:00
koogua
d4939f9c61 Merge branch 'koogua/v1.2.6-preview' into demo 2021-02-14 21:43:23 +08:00
koogua
122b4adfa8 v1.2.6预览版01 2021-02-14 21:41:38 +08:00
winzer
9ed2753cef 修正合并错误 2021-02-13 21:55:04 +08:00
winzer
f24eef065b 修正合并错误 2021-02-13 20:51:08 +08:00
winzer
62964bbd95 Merge branch 'winzer/I2EJH8' into demo
# Conflicts:
#	app/Console/Tasks/CleanLogTask.php
#	app/Console/Tasks/DeliverTask.php
#	app/Console/Tasks/NoticeTask.php
#	app/Http/Admin/Services/AuthNode.php
#	app/Http/Admin/Services/Setting.php
#	app/Http/Api/Services/Account.php
#	app/Library/Utils/Lock.php
#	app/Listeners/Trade.php
#	app/Listeners/User.php
#	app/Models/Course.php
#	app/Models/Online.php
#	app/Models/UserSession.php
#	app/Models/UserToken.php
#	app/Services/Auth/Api.php
#	app/Services/Auth/Home.php
2021-02-13 19:09:30 +08:00
winzer
7f7636b953 增加原始价格,市场价改名为优惠价 2021-02-13 18:33:57 +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
4f3b2ea322 增加原始价格,市场价改名为优惠价 2021-02-03 13:09:38 +08:00
xiaochong0302
26deccc36b 增加限制共享帐号功能 2021-01-02 14:36:07 +08:00
xiaochong0302
aef87543ff 增加限制共享帐号功能 2021-01-02 14:35:14 +08:00