Commit Graph

3998 Commits

Author SHA1 Message Date
lxk0301 c282dbcebf update 2020-12-14 17:36:02 +08:00
anonymous 8ea3a208fb Merge remote-tracking branch 'upstream/master' 2020-12-14 16:54:03 +08:00
EvineDeng 1358810f02 Merge remote-tracking branch 'upstream/master' 2020-12-14 16:54:03 +08:00
anonymous 24e440c7f4 Merge pull request #12 from lxk0301/master
Master
2020-12-14 16:25:33 +08:00
any 5e834fab70 Merge pull request #12 from lxk0301/master
Master
2020-12-14 16:25:33 +08:00
lxk0301 3e9436222f update 2020-12-14 16:22:36 +08:00
lxk0301 d9cd8a7c9a update 2020-12-14 16:22:36 +08:00
lxk0301 d35c9dbf78 Merge remote-tracking branch 'origin/master' 2020-12-14 16:11:58 +08:00
lxk0301 70ac5f12c7 Merge remote-tracking branch 'origin/master' 2020-12-14 16:11:58 +08:00
lxk0301 88d3ececca update 2020-12-14 16:11:46 +08:00
lxk0301 3525f0a914 update 2020-12-14 16:11:46 +08:00
lxk0301 9dd8f2f8af Merge pull request #329 from JunzhouLiu/master
增加服务器资源约束配置
2020-12-14 15:58:17 +08:00
lxk0301 80bac98ec9 Merge pull request #329 from JunzhouLiu/master
增加服务器资源约束配置
2020-12-14 15:58:17 +08:00
lxk0301 f7afb94f31 更新Surge的Task脚本模块
地址: https://raw.githubusercontent.com/lxk0301/jd_scripts/master/Surge/lxk0301_Task.sgmodule.sgmodule
2020-12-14 15:54:44 +08:00
lxk0301 4dedbcd054 更新Surge的Task脚本模块
地址: https://raw.githubusercontent.com/lxk0301/jd_scripts/master/Surge/lxk0301_Task.sgmodule.sgmodule
2020-12-14 15:54:44 +08:00
JunzhouLiu d7038989ee 增加服务器资源约束配置。 2020-12-14 15:36:06 +08:00
JunzhouLiu dc1233a82a 增加服务器资源约束配置。 2020-12-14 15:36:06 +08:00
Junzhou Liu df72ea9c05 Merge pull request #1 from lxk0301/master
Master
2020-12-14 15:13:52 +08:00
Junzhou Liu 6bb6df6acf Merge pull request #1 from lxk0301/master
Master
2020-12-14 15:13:52 +08:00
anonymous 6ed9d15e43 Merge remote-tracking branch 'upstream/master' 2020-12-14 11:54:09 +08:00
EvineDeng 423e33a060 Merge remote-tracking branch 'upstream/master' 2020-12-14 11:54:09 +08:00
lxk0301 dda72f453f fix 2020-12-14 11:29:06 +08:00
lxk0301 b8900efb69 fix 2020-12-14 11:29:06 +08:00
anonymous f440a9168c Merge remote-tracking branch 'upstream/master' 2020-12-14 10:54:18 +08:00
EvineDeng ae13a3edcb Merge remote-tracking branch 'upstream/master' 2020-12-14 10:54:18 +08:00
lxk0301 e64fcd499c jd_joy.js宠汪汪参加赛跑级别可设置不同账号参加不同的级别,如若想设置不同账号参加不同类别的比赛则用&区分即可(如:2&10&50) 2020-12-14 10:43:45 +08:00
lxk0301 192118835d jd_joy.js宠汪汪参加赛跑级别可设置不同账号参加不同的级别,如若想设置不同账号参加不同类别的比赛则用&区分即可(如:2&10&50) 2020-12-14 10:43:45 +08:00
anonymous 7b83b5c646 Merge remote-tracking branch 'upstream/master' 2020-12-14 09:54:03 +08:00
EvineDeng adc4487a0d Merge remote-tracking branch 'upstream/master' 2020-12-14 09:54:03 +08:00
lxk0301 e5c821acdd 迁移已过期的短期活动至activity文件夹。删除task订阅以及docker里面已过期活动 2020-12-14 09:26:49 +08:00
lxk0301 7127cef3bc 迁移已过期的短期活动至activity文件夹。删除task订阅以及docker里面已过期活动 2020-12-14 09:26:49 +08:00
anonymous 20f3d4296a 删除Docker的PUBG游戏盛典活动定时任务 2020-12-14 09:04:06 +08:00
EvineDeng fad12a5924 删除Docker的PUBG游戏盛典活动定时任务 2020-12-14 09:04:06 +08:00
lxk0301 42bbf42967 Merge pull request #322 from EvineDeng/master
去除过期的定时任务
2020-12-13 23:27:57 +08:00
lxk0301 6d0c334aa2 Merge pull request #322 from EvineDeng/master
去除过期的定时任务
2020-12-13 23:27:57 +08:00
lxk0301 783071b530 Merge pull request #318 from DoveBoy/master
迁移活动脚本
2020-12-13 23:25:19 +08:00
lxk0301 5cff5da652 Merge pull request #318 from DoveBoy/master
迁移活动脚本
2020-12-13 23:25:19 +08:00
anonymous dcb14929b4 Merge pull request #11 from lxk0301/master
Master
2020-12-13 20:16:05 +08:00
any be999eb165 Merge pull request #11 from lxk0301/master
Master
2020-12-13 20:16:05 +08:00
anonymous 898a2641ba 移动部分过期的脚本 2020-12-13 18:53:55 +08:00
EvineDeng 5c51275288 移动部分过期的脚本 2020-12-13 18:53:55 +08:00
anonymous c9ba9a1f95 1.增加京东金融签到定时任务;2.将部分过期的脚本移动到backUp文件夹;3.上个commit错误删除了苹果超品日互动抽奖,还原。 2020-12-13 18:49:19 +08:00
EvineDeng d74f69ef52 1.增加京东金融签到定时任务;2.将部分过期的脚本移动到backUp文件夹;3.上个commit错误删除了苹果超品日互动抽奖,还原。 2020-12-13 18:49:19 +08:00
anonymous eac35bc0ee 去除过期的定时任务 2020-12-13 18:39:20 +08:00
EvineDeng 4079869976 去除过期的定时任务 2020-12-13 18:39:20 +08:00
DoveBoy 0dbe3c3432 Delete jdJxStoryShareCodes.js 2020-12-13 11:12:15 +08:00
DoveBoy eab286e236 Delete jdJxStoryShareCodes.js 2020-12-13 11:12:15 +08:00
lxk0301 bc2add650d Merge pull request #312 from tanmx/patch-3
Update Readme.md
2020-12-13 11:06:37 +08:00
lxk0301 96bdc2c468 Merge pull request #312 from tanmx/patch-3
Update Readme.md
2020-12-13 11:06:37 +08:00
lxk0301 9761cc449e Delete jdJxStoryShareCodes.js 2020-12-13 11:03:57 +08:00