82 Commits

Author	SHA1	Message	Date
koogua	4bcf5a2d98	Merge branch 'koogua/v1.3.5' into demo	2021-05-20 18:53:57 +08:00
koogua	b58cb44f04	v1.3.5阶段提交	2021-05-20 18:50:50 +08:00
koogua	6254ac94ca	v1.3.5阶段提交	2021-05-16 19:19:20 +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	863505dcca	阶段提交	2021-05-12 20:41:24 +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	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	d98b936969	专栏阶段性提交	2021-04-08 19:58:30 +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	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	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	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	3838d95dc4	整理通知相关以及deleted字段相关	2021-03-02 20:14:47 +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	c4f218ea84	dingtalk通知阶段提交	2021-02-22 11:40:16 +08:00
koogua	7acfaf17a9	dingtalk通知阶段提交	2021-02-22 11:38:19 +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	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	4f3b2ea322	增加原始价格，市场价改名为优惠价	2021-02-03 13:09:38 +08:00
xiaochong0302	197e4a62af	增加公众号自定义菜单	2021-01-07 15:15:27 +08:00
xiaochong0302	13ff8d0041	后台增加上传logo和favicon	2021-01-07 15:15:27 +08:00
xiaochong0302	610247f0ca	优化task查询	2021-01-07 15:15:26 +08:00
xiaochong0302	0902fa35a7	增加公众号自定义菜单	2021-01-07 15:10:43 +08:00
xiaochong0302	9db288c406	后台增加上传logo和favicon	2021-01-07 15:10:43 +08:00
xiaochong0302	b45cfa2279	优化task查询	2021-01-07 15:10:42 +08:00
xiaochong0302	94affaddf6	修复数据迁移中无符号整型问题	2021-01-03 13:27:33 +08:00
xiaochong0302	c2487adc74	修复数据迁移中无符号整型问题	2021-01-03 13:26:55 +08:00
xiaochong0302	26deccc36b	增加限制共享帐号功能	2021-01-02 14:36:07 +08:00
xiaochong0302	aef87543ff	增加限制共享帐号功能	2021-01-02 14:35:14 +08:00
xiaochong0302	0642d430ff	增加课程推荐	2020-12-28 13:06:53 +08:00
xiaochong0302	906e458ed0	增加课程推荐	2020-12-28 13:04:40 +08:00