Commit Graph
100 Commits
Author SHA1 Message Date
Kslr 75a570fa56 Merge pull request #480 from EpLiar/update-alibaba
Update alibaba
2020-06-08 19:01:10 +08:00
Kslr a4dec4fa2b Merge pull request #479 from Loyalsoldier/add-mega
Include mega into geolocation-!cn category
2020-06-08 10:33:38 +08:00
Kslr cb29ece749 Merge pull request #475 from Loyalsoldier/master
Update workflow
2020-06-06 11:40:49 +08:00
Kslr cedb091992 Merge pull request #470 from Loyalsoldier/update-zoho
Update zoho
2020-06-06 09:29:40 +08:00
Kslr 1b9094dc6e Merge pull request #471 from Loyalsoldier/update-alibaba
Update alibaba
2020-06-06 09:29:15 +08:00
Kslr 01381d118d Merge pull request #473 from EpLiar/update-yunfanjiasu
Update yunfanjiasu.
2020-06-06 09:26:15 +08:00
Kslr 5f978bf1f6 Merge pull request #474 from rhjdvsgsgks/patch-1
add manmanbuy
2020-06-06 09:23:52 +08:00
Kslr c0ca0a617c Merge pull request #469 from EpLiar/update-alibaba
Update alibaba, move teambition into alibaba.
2020-06-05 16:30:07 +08:00
Kslr 9555f768c1 Merge pull request #461 from EpLiar/186354BD
Update 58tongcheng, geolocation-cn and jd.
2020-06-05 06:22:30 +08:00
Kslr 16003d229a Merge pull request #464 from Loyalsoldier/add-urlshortener
Include several url shorteners into geolocation-!cn category
2020-06-05 04:27:22 +08:00
Kslr 7f9502523e Merge pull request #465 from Loyalsoldier/update-epicgames
Update epicgames
2020-06-05 04:23:33 +08:00
Kslr 9bbf84cdd4 Merge pull request #463 from Loyalsoldier/update-discord
Update discord
2020-06-04 06:07:41 +08:00
Kslr 1eacf2aedc Merge pull request #462 from EpLiar/update-sf
Update sf-express
2020-06-03 16:08:52 +08:00
Kslr 2b35877fba Merge pull request #459 from EpLiar/0DD75ABB
Update alibaba and geolocation-cn.
2020-06-03 14:11:15 +08:00
Kslr 480121376a Merge pull request #458 from Loyalsoldier/update-workflow
Update workflow
2020-06-03 04:17:09 +08:00
Kslr 80c5fb715a Merge pull request #456 from Loyalsoldier/update-fox
Update fox
2020-06-03 01:16:20 +08:00
Kslr 7802a947dc Merge pull request #457 from Loyalsoldier/update-!cn
Include tiktok & attwatchtv into geolocation-!cn category
2020-06-03 01:14:57 +08:00
Kslr a3a9af1370 Merge pull request #453 from EpLiar/CFC054
Update douyu, geolocation-cn and qihoo360.
2020-06-02 02:30:41 +08:00
Kslr 004325f888 Merge pull request #444 from Loyalsoldier/update-notion
Include notion into geolocation-!cn category
2020-05-30 05:53:43 +08:00
Kslr 4c67dd843e Merge pull request #447 from Loyalsoldier/update-google
Update google
2020-05-30 05:52:30 +08:00
Kslr 1b4b40fab9 Merge pull request #448 from Loyalsoldier/update-google-ads
Sort google-ads
2020-05-30 05:51:45 +08:00
Kslr e3d71bc317 Merge pull request #449 from EpLiar/0872E0
Update 58tongcheng and geolocation-cn.
2020-05-30 05:50:56 +08:00
Kslr dd399a3d0a Merge pull request #445 from Loyalsoldier/update-golang
Update golang
2020-05-29 13:59:23 +08:00
Kslr 5b69bc1cce Merge pull request #443 from junjieyuan/add-miwifi_com
Rewrite xiaomi, add miwifi.com (The management web page and official …
2020-05-28 00:08:40 +08:00
Kslr f43207be45 Merge pull request #442 from Loyalsoldier/update-amazon
Update amazon
2020-05-27 17:08:35 +08:00
Kslr 30f4c59c97 Merge pull request #438 from Loyalsoldier/update-tiktok
Update tiktok
2020-05-26 19:13:55 +08:00
Kslr e0d87365a9 Merge pull request #439 from Loyalsoldier/add-ark
Include ark into category-vpnservices
2020-05-26 19:04:25 +08:00
Kslr 929d223d07 Merge pull request #440 from Loyalsoldier/update-bilibili
Update bilibili
2020-05-26 19:03:16 +08:00
Kslr 873191f998 Merge pull request #436 from StarryVoid/patch-2
Add Notion.com domain file "notion"
2020-05-25 18:16:26 +08:00
Kslr 9eea38fb38 Merge pull request #437 from EpLiar/add-pptv
Add pptv, update geolocation-cn
2020-05-25 18:15:09 +08:00
Kslr 561297cd7f Merge pull request #435 from rhjdvsgsgks/patch-1
Update baidu
2020-05-24 22:39:15 +08:00
Kslr 0cec4feb9f Merge pull request #434 from Loyalsoldier/update-yyets
Update yyets
2020-05-23 16:31:32 +08:00
Kslr f3d4ce6772 Merge pull request #432 from Loyalsoldier/update-!cn
Include hinet & litv into geolocation-!cn category
2020-05-22 15:50:48 +08:00
Kslr 6f65853954 Merge pull request #433 from Loyalsoldier/update-apkpure
Update apkpure
2020-05-22 15:50:25 +08:00
Kslr 04446254e9 Merge pull request #429 from Loyalsoldier/update-scholar
Include cern & nejm into category-scholar-!cn
2020-05-20 14:27:42 +08:00
Kslr 6bca380ee8 Merge pull request #428 from Loyalsoldier/update-voanews-1
Update voanews
2020-05-20 14:26:29 +08:00
Kslr 09d6ed8c47 Merge pull request #427 from Loyalsoldier/add-deno
Include deno into category-dev
2020-05-20 14:25:46 +08:00
Kslr 545e88d1c7 Merge pull request #426 from Loyalsoldier/update-zeit
Rename zeit to vercel
2020-05-20 13:57:51 +08:00
Kslr b4bb7b1fc5 Merge pull request #423 from EpLiar/add-tiancity
Add and update.
2020-05-15 17:53:49 +08:00
Kslr 1fe5be9098 Merge pull request #421 from EpLiar/add-meizu
Add meizu and xueqiu
2020-05-11 16:55:37 +08:00
Kslr c5af967728 Merge pull request #417 from Loyalsoldier/update-google
Update google
2020-05-06 20:29:37 +08:00
Kslr 2ebeba23aa Merge pull request #415 from Loyalsoldier/add-dcard
Include dcard into geolocation-!cn category
2020-05-06 17:59:16 +08:00
Kslr efd815c348 Merge pull request #413 from johnrosen1/master
add tiktok domains
2020-05-04 18:38:57 +08:00
Kslr 117536ab3c Merge pull request #414 from junjieyuan/add-zhihuishu_com
add zhihuishu.com
2020-05-04 18:37:07 +08:00
Kslr 70d1a2fc3c Merge pull request #408 from studentmain/master
add e-hentai domains
2020-05-03 02:03:06 +08:00
Kslr 2ddfb28a45 Merge pull request #381 from Loyalsoldier/update-cnn
Update cnn
2020-04-29 18:56:38 +08:00
Kslr acd429814f Merge pull request #398 from Loyalsoldier/update-steam
Update steam
2020-04-29 18:56:06 +08:00
Kslr 5df6c2e927 Merge pull request #393 from Loyalsoldier/update-nytimes
Update nytimes
2020-04-29 18:55:14 +08:00
Kslr b1ebfbc758 Merge pull request #388 from Loyalsoldier/update-hp
Update hp
2020-04-29 18:28:13 +08:00
Kslr 440aef863b Merge pull request #396 from Loyalsoldier/update-samsung
Update samsung
2020-04-29 01:09:08 +08:00
Kslr 5d2dcaa77a Merge pull request #384 from Loyalsoldier/update-elsevier
Update elsevier
2020-04-29 01:08:23 +08:00
Kslr 692828e514 Merge pull request #397 from Loyalsoldier/update-stackexchange
Update stackexchange
2020-04-29 01:07:26 +08:00
Kslr 461dcaab1a Merge pull request #399 from Loyalsoldier/update-uber
Update uber
2020-04-29 01:05:57 +08:00
Kslr c8053d4e08 Merge pull request #375 from LiJingqing/master
Add hkedity and twitch
2020-04-27 15:10:50 +08:00
Kslr 9b9b51a52d Merge pull request #376 from EpLiar/update-geolocation-cn
Update geolocation-cn and tencent
2020-04-27 15:09:04 +08:00
Kslr 65f3d19382 Merge pull request #337 from rhjdvsgsgks/patch-1
add some ad domains
2020-04-24 20:35:26 +08:00
Kslr 1de40a2901 Merge branch 'master' into patch-1 2020-04-24 20:35:13 +08:00
Kslr 8da13c8ef3 Merge pull request #368 from Loyalsoldier/update-adobe
Update adobe
2020-04-23 04:51:14 +08:00
Kslr 357b9afa2b Merge pull request #359 from Loyalsoldier/update-digicert
Update digicert
2020-04-21 14:37:56 +08:00
Kslr d70245d6e5 Merge pull request #355 from Loyalsoldier/update-v2ray
Update v2ray
2020-04-21 14:35:28 +08:00
Kslr f4378daf0c Merge pull request #358 from Loyalsoldier/update-google
Update google
2020-04-21 14:30:31 +08:00
Kslr dbcab4fb62 Merge pull request #343 from EpLiar/add-ruanmei
Add ruanmei, update geolocation-cn
2020-04-18 11:55:08 +08:00
Kslr 6c33bb8d0c Merge pull request #345 from Loyalsoldier/update-rarbg
Update rarbg
2020-04-18 11:52:00 +08:00
Kslr 938d8dd581 Merge pull request #327 from Loyalsoldier/master
Update amazon
2020-04-10 20:00:38 +08:00
Kslr a6c018dbc6 Merge pull request #326 from Loyalsoldier/update-docker
Update docker
2020-04-10 17:10:56 +08:00
Kslr 4c94a4116a Merge pull request #325 from Loyalsoldier/update-npmjs
Update npmjs
2020-04-10 17:10:02 +08:00
Kslr 9283cd00e6 Merge pull request #308 from Loyalsoldier/update-google
Remove golang.org from google sub-list
2020-04-07 19:15:14 +08:00
Kslr ce57b03f86 Merge pull request #289 from EpLiar/add-zsxq
Add zsxq in geolocation-cn, renamed sf to sf-express
2020-04-06 12:10:17 +08:00
Kslr e32765570f Merge pull request #286 from Loyalsoldier/remove-speedtest
Remove speedtest due to #285. Fixes #285
2020-04-06 00:41:17 +08:00
Kslr c0cd36728a Merge pull request #279 from junjieyuan/add-tipdm-cup
add TipDM Cup
2020-04-01 17:28:17 +08:00
Kslr 514cf64cf2 Merge pull request #269 from Loyalsoldier/update-dropbox
Update dropbox
2020-03-22 22:08:08 +08:00
Kslr 25da5081b1 Merge pull request #238 from ToutyRater/patch-2
Add more ads domains
2020-03-03 01:43:42 +08:00
Kslr d6358ad86e Merge pull request #235 from Loyalsoldier/patch-1
Update github sub-list
2020-02-28 01:06:42 +08:00
Kslr 8409757955 Merge pull request #220 from mzz2017/patch-2
Update alibaba
2020-02-25 19:47:19 +08:00
Kslr c2bc202221 Merge pull request #214 from rhjdvsgsgks/patch-1
Patch 1
2020-02-25 01:14:07 +08:00
Kslr cf60fb3210 Merge pull request #160 from Loyalsoldier/add-gfw
Update gfw related domains
2020-01-10 18:16:13 +08:00
Kslr 944457de42 Merge pull request #159 from Loyalsoldier/update-disqus
Update disqus
2020-01-10 18:01:37 +08:00
Kslr 06c94d372c Merge pull request #156 from Loyalsoldier/master
Sort geolocation-cn
2020-01-09 20:25:56 +08:00
Kslr ae19bb9905 Merge pull request #152 from Loyalsoldier/classification
Classified geolocation-!cn & fix porn inclusion
2020-01-09 15:50:05 +08:00
Kslr 4a155e2ee5 Merge pull request #155 from akiirui/fix-jsdelivr-2
Fix "Move jsDelivr back to `geolocation-cn`" #147
2020-01-08 18:22:05 +08:00
Kslr 237440de31 Merge pull request #151 from Loyalsoldier/porn
Add more porn domains & rename file porn to category-porn
2020-01-07 16:31:38 +08:00
Kslr dda998531b Merge pull request #150 from Loyalsoldier/fix-ads
Fix ads
2020-01-07 16:25:16 +08:00
Kslr 7fa89f5431 Merge pull request #149 from Loyalsoldier/tld
Add more Chinese TLD
2020-01-07 16:24:16 +08:00
Kslr 404b3460e5 Merge pull request #143 from Zzqqbs/master
Update and rename some files
2020-01-06 13:03:43 +08:00
Kslr c33da082d1 Merge pull request #139 from Zzqqbs/master
Add "gitbook", "disqus", "hp" and more
2020-01-02 00:26:07 +08:00
Kslr 35027f897d Merge pull request #136 from Zzqqbs/master
Add "acfun", "kuaishou" and ads
2019-12-29 05:15:27 +08:00
Kslr 0284f03b5e Merge pull request #137 from Loyalsoldier/master
Update appledaily
2019-12-29 05:09:26 +08:00
Kslr 8612ee8a72 Merge pull request #134 from Zzqqbs/master
Create and include umeng-ads
2019-12-27 17:45:59 +08:00
Kslr 10a6c50a8c Merge pull request #133 from Zzqqbs/master
Add sub-list
2019-12-27 00:39:55 +08:00
Kslr fc76319204 Merge pull request #130 from Loyalsoldier/dev
add some domains
2019-12-26 21:38:39 +08:00
Kslr bc019c148c Merge pull request #132 from Zzqqbs/master
Add some domain
2019-12-26 21:19:50 +08:00
Kslr 90823151d7 Merge pull request #128 from akiirui/fix-jsdelivr
geolocation-cn: delete *.jsdelivr.{com,net}
2019-12-17 18:10:35 +08:00
Kslr fe06937c30 Merge pull request #126 from i-love-tadpole/patch-1
Update douyu
2019-12-14 21:00:27 +08:00
Kslr 095de35f07 Merge pull request #124 from akiirui/clear-duplicates
Clear duplicate rules
2019-12-11 13:35:01 +08:00
Kslr 6526150c16 Merge pull request #123 from Alion548/patch-2
Update youtube
2019-12-10 13:36:41 +08:00
Kslr 48f893da0f Merge pull request #121 from Loyalsoldier/porn1
Add blocked porn domains into !cn list
2019-12-08 21:05:05 +08:00
Kslr d3ebc77786 Merge pull request #114 from OpportunityLiu/patch-3
Update bilibili
2019-11-30 21:35:21 +08:00
Kslr d80b3dee41 Merge pull request #113 from OpportunityLiu/patch-3
Update github
2019-11-29 20:50:14 +08:00
Kslr 071d062139 Merge pull request #112 from maddie/patch-1
Add Yunzhijia domains
2019-11-28 17:38:28 +08:00
Kslr 8be2f25bea Merge pull request #110 from ilouiss/master
add some domain
2019-11-22 18:14:58 +08:00