Commit Graph
100 Commits
Author SHA1 Message Date
KslrandGitHub 873191f998 Merge pull request #436 from StarryVoid/patch-2
Add Notion.com domain file "notion"
2020-05-25 18:16:26 +08:00
KslrandGitHub 9eea38fb38 Merge pull request #437 from EpLiar/add-pptv
Add pptv, update geolocation-cn
2020-05-25 18:15:09 +08:00
KslrandGitHub 561297cd7f Merge pull request #435 from rhjdvsgsgks/patch-1
Update baidu
2020-05-24 22:39:15 +08:00
KslrandGitHub 0cec4feb9f Merge pull request #434 from Loyalsoldier/update-yyets
Update yyets
2020-05-23 16:31:32 +08:00
KslrandGitHub f3d4ce6772 Merge pull request #432 from Loyalsoldier/update-!cn
Include hinet & litv into geolocation-!cn category
2020-05-22 15:50:48 +08:00
KslrandGitHub 6f65853954 Merge pull request #433 from Loyalsoldier/update-apkpure
Update apkpure
2020-05-22 15:50:25 +08:00
KslrandGitHub 04446254e9 Merge pull request #429 from Loyalsoldier/update-scholar
Include cern & nejm into category-scholar-!cn
2020-05-20 14:27:42 +08:00
KslrandGitHub 6bca380ee8 Merge pull request #428 from Loyalsoldier/update-voanews-1
Update voanews
2020-05-20 14:26:29 +08:00
KslrandGitHub 09d6ed8c47 Merge pull request #427 from Loyalsoldier/add-deno
Include deno into category-dev
2020-05-20 14:25:46 +08:00
KslrandGitHub 545e88d1c7 Merge pull request #426 from Loyalsoldier/update-zeit
Rename zeit to vercel
2020-05-20 13:57:51 +08:00
KslrandGitHub b4bb7b1fc5 Merge pull request #423 from EpLiar/add-tiancity
Add and update.
2020-05-15 17:53:49 +08:00
KslrandGitHub 1fe5be9098 Merge pull request #421 from EpLiar/add-meizu
Add meizu and xueqiu
2020-05-11 16:55:37 +08:00
KslrandGitHub c5af967728 Merge pull request #417 from Loyalsoldier/update-google
Update google
2020-05-06 20:29:37 +08:00
KslrandGitHub 2ebeba23aa Merge pull request #415 from Loyalsoldier/add-dcard
Include dcard into geolocation-!cn category
2020-05-06 17:59:16 +08:00
KslrandGitHub efd815c348 Merge pull request #413 from johnrosen1/master
add tiktok domains
2020-05-04 18:38:57 +08:00
KslrandGitHub 117536ab3c Merge pull request #414 from junjieyuan/add-zhihuishu_com
add zhihuishu.com
2020-05-04 18:37:07 +08:00
KslrandGitHub 70d1a2fc3c Merge pull request #408 from studentmain/master
add e-hentai domains
2020-05-03 02:03:06 +08:00
KslrandGitHub 2ddfb28a45 Merge pull request #381 from Loyalsoldier/update-cnn
Update cnn
2020-04-29 18:56:38 +08:00
KslrandGitHub acd429814f Merge pull request #398 from Loyalsoldier/update-steam
Update steam
2020-04-29 18:56:06 +08:00
KslrandGitHub 5df6c2e927 Merge pull request #393 from Loyalsoldier/update-nytimes
Update nytimes
2020-04-29 18:55:14 +08:00
KslrandGitHub b1ebfbc758 Merge pull request #388 from Loyalsoldier/update-hp
Update hp
2020-04-29 18:28:13 +08:00
KslrandGitHub 440aef863b Merge pull request #396 from Loyalsoldier/update-samsung
Update samsung
2020-04-29 01:09:08 +08:00
KslrandGitHub 5d2dcaa77a Merge pull request #384 from Loyalsoldier/update-elsevier
Update elsevier
2020-04-29 01:08:23 +08:00
KslrandGitHub 692828e514 Merge pull request #397 from Loyalsoldier/update-stackexchange
Update stackexchange
2020-04-29 01:07:26 +08:00
KslrandGitHub 461dcaab1a Merge pull request #399 from Loyalsoldier/update-uber
Update uber
2020-04-29 01:05:57 +08:00
KslrandGitHub c8053d4e08 Merge pull request #375 from LiJingqing/master
Add hkedity and twitch
2020-04-27 15:10:50 +08:00
KslrandGitHub 9b9b51a52d Merge pull request #376 from EpLiar/update-geolocation-cn
Update geolocation-cn and tencent
2020-04-27 15:09:04 +08:00
KslrandGitHub 65f3d19382 Merge pull request #337 from rhjdvsgsgks/patch-1
add some ad domains
2020-04-24 20:35:26 +08:00
KslrandGitHub 1de40a2901 Merge branch 'master' into patch-1 2020-04-24 20:35:13 +08:00
KslrandGitHub 8da13c8ef3 Merge pull request #368 from Loyalsoldier/update-adobe
Update adobe
2020-04-23 04:51:14 +08:00
KslrandGitHub 357b9afa2b Merge pull request #359 from Loyalsoldier/update-digicert
Update digicert
2020-04-21 14:37:56 +08:00
KslrandGitHub d70245d6e5 Merge pull request #355 from Loyalsoldier/update-v2ray
Update v2ray
2020-04-21 14:35:28 +08:00
KslrandGitHub f4378daf0c Merge pull request #358 from Loyalsoldier/update-google
Update google
2020-04-21 14:30:31 +08:00
KslrandGitHub dbcab4fb62 Merge pull request #343 from EpLiar/add-ruanmei
Add ruanmei, update geolocation-cn
2020-04-18 11:55:08 +08:00
KslrandGitHub 6c33bb8d0c Merge pull request #345 from Loyalsoldier/update-rarbg
Update rarbg
2020-04-18 11:52:00 +08:00
KslrandGitHub 938d8dd581 Merge pull request #327 from Loyalsoldier/master
Update amazon
2020-04-10 20:00:38 +08:00
KslrandGitHub a6c018dbc6 Merge pull request #326 from Loyalsoldier/update-docker
Update docker
2020-04-10 17:10:56 +08:00
KslrandGitHub 4c94a4116a Merge pull request #325 from Loyalsoldier/update-npmjs
Update npmjs
2020-04-10 17:10:02 +08:00
KslrandGitHub 9283cd00e6 Merge pull request #308 from Loyalsoldier/update-google
Remove golang.org from google sub-list
2020-04-07 19:15:14 +08:00
KslrandGitHub 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
KslrandGitHub e32765570f Merge pull request #286 from Loyalsoldier/remove-speedtest
Remove speedtest due to #285. Fixes #285
2020-04-06 00:41:17 +08:00
KslrandGitHub c0cd36728a Merge pull request #279 from junjieyuan/add-tipdm-cup
add TipDM Cup
2020-04-01 17:28:17 +08:00
KslrandGitHub 514cf64cf2 Merge pull request #269 from Loyalsoldier/update-dropbox
Update dropbox
2020-03-22 22:08:08 +08:00
KslrandGitHub 25da5081b1 Merge pull request #238 from ToutyRater/patch-2
Add more ads domains
2020-03-03 01:43:42 +08:00
KslrandGitHub d6358ad86e Merge pull request #235 from Loyalsoldier/patch-1
Update github sub-list
2020-02-28 01:06:42 +08:00
KslrandGitHub 8409757955 Merge pull request #220 from mzz2017/patch-2
Update alibaba
2020-02-25 19:47:19 +08:00
KslrandGitHub c2bc202221 Merge pull request #214 from rhjdvsgsgks/patch-1
Patch 1
2020-02-25 01:14:07 +08:00
KslrandGitHub cf60fb3210 Merge pull request #160 from Loyalsoldier/add-gfw
Update gfw related domains
2020-01-10 18:16:13 +08:00
KslrandGitHub 944457de42 Merge pull request #159 from Loyalsoldier/update-disqus
Update disqus
2020-01-10 18:01:37 +08:00
KslrandGitHub 06c94d372c Merge pull request #156 from Loyalsoldier/master
Sort geolocation-cn
2020-01-09 20:25:56 +08:00
KslrandGitHub ae19bb9905 Merge pull request #152 from Loyalsoldier/classification
Classified geolocation-!cn & fix porn inclusion
2020-01-09 15:50:05 +08:00
KslrandGitHub 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
KslrandGitHub 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
KslrandGitHub dda998531b Merge pull request #150 from Loyalsoldier/fix-ads
Fix ads
2020-01-07 16:25:16 +08:00
KslrandGitHub 7fa89f5431 Merge pull request #149 from Loyalsoldier/tld
Add more Chinese TLD
2020-01-07 16:24:16 +08:00
KslrandGitHub 404b3460e5 Merge pull request #143 from Zzqqbs/master
Update and rename some files
2020-01-06 13:03:43 +08:00
KslrandGitHub c33da082d1 Merge pull request #139 from Zzqqbs/master
Add "gitbook", "disqus", "hp" and more
2020-01-02 00:26:07 +08:00
KslrandGitHub 35027f897d Merge pull request #136 from Zzqqbs/master
Add "acfun", "kuaishou" and ads
2019-12-29 05:15:27 +08:00
KslrandGitHub 0284f03b5e Merge pull request #137 from Loyalsoldier/master
Update appledaily
2019-12-29 05:09:26 +08:00
KslrandGitHub 8612ee8a72 Merge pull request #134 from Zzqqbs/master
Create and include umeng-ads
2019-12-27 17:45:59 +08:00
KslrandGitHub 10a6c50a8c Merge pull request #133 from Zzqqbs/master
Add sub-list
2019-12-27 00:39:55 +08:00
KslrandGitHub fc76319204 Merge pull request #130 from Loyalsoldier/dev
add some domains
2019-12-26 21:38:39 +08:00
KslrandGitHub bc019c148c Merge pull request #132 from Zzqqbs/master
Add some domain
2019-12-26 21:19:50 +08:00
KslrandGitHub 90823151d7 Merge pull request #128 from akiirui/fix-jsdelivr
geolocation-cn: delete *.jsdelivr.{com,net}
2019-12-17 18:10:35 +08:00
KslrandGitHub fe06937c30 Merge pull request #126 from i-love-tadpole/patch-1
Update douyu
2019-12-14 21:00:27 +08:00
KslrandGitHub 095de35f07 Merge pull request #124 from akiirui/clear-duplicates
Clear duplicate rules
2019-12-11 13:35:01 +08:00
KslrandGitHub 6526150c16 Merge pull request #123 from Alion548/patch-2
Update youtube
2019-12-10 13:36:41 +08:00
KslrandGitHub 48f893da0f Merge pull request #121 from Loyalsoldier/porn1
Add blocked porn domains into !cn list
2019-12-08 21:05:05 +08:00
KslrandGitHub d3ebc77786 Merge pull request #114 from OpportunityLiu/patch-3
Update bilibili
2019-11-30 21:35:21 +08:00
KslrandGitHub d80b3dee41 Merge pull request #113 from OpportunityLiu/patch-3
Update github
2019-11-29 20:50:14 +08:00
KslrandGitHub 071d062139 Merge pull request #112 from maddie/patch-1
Add Yunzhijia domains
2019-11-28 17:38:28 +08:00
KslrandGitHub 8be2f25bea Merge pull request #110 from ilouiss/master
add some domain
2019-11-22 18:14:58 +08:00
KslrandGitHub e9d34ba2c6 Merge pull request #109 from forever8938/master
rearrange google and google-ads
2019-11-21 16:20:36 +08:00
KslrandGitHub 3e431519dd Merge pull request #108 from forever8938/master
Update microsoft
2019-11-20 23:16:28 +08:00
KslrandGitHub d58d4b7d61 Merge pull request #107 from OpportunityLiu/patch-2
Create private
2019-11-20 22:36:19 +08:00
KslrandGitHub c2f484c99b Merge pull request #103 from ToutyRater/patch-1
Add more cn sites
2019-11-01 20:33:47 +08:00
KslrandGitHub 9e296e6658 Merge pull request #102 from funray/patch-1
Update reuters
2019-10-28 20:46:10 +08:00
KslrandGitHub 8c55fcbd04 Merge pull request #100 from akiirui/ngabbs-patch
geolocation-cn: add ngabbs & cdn
2019-10-24 20:33:58 +08:00
KslrandGitHub b36c4c6f57 Merge pull request #99 from OpportunityLiu/patch-1
Add moegirl.org
2019-10-23 01:25:14 +08:00
KslrandGitHub 83595cd2af Merge pull request #98 from OpportunityLiu/master
add dingtalk; update alibaba
2019-10-22 12:50:04 +08:00
KslrandGitHub 7f1ee1f24a Merge pull request #97 from eycorsican/fix-ytimg
ytimg.com is owned by youtube
2019-10-19 07:20:24 +08:00
KslrandGitHub c142b0af08 Merge pull request #96 from gordon-zhao/master
Add youku & Minor updates
2019-10-15 23:20:36 +08:00
KslrandGitHub 7a9b6a10e5 Merge pull request #95 from ToutyRater/patch-5
Add Hulu
2019-10-12 23:58:59 +08:00
KslrandGitHub b81fb0cb13 Merge pull request #94 from iochen/master
Add some ms domains
2019-10-04 20:36:22 +08:00
KslrandGitHub b6efaefa6e Merge pull request #92 from iochen/master
modify acplay data
2019-08-27 15:31:10 +08:00
KslrandGitHub feee84aa63 Merge pull request #89 from iochen/master
Add some wikimedia domains.
2019-08-22 10:31:54 +08:00
KslrandGitHub 5a6ed49ef9 Merge pull request #87 from cbdog94/master
Add Spotify domains.
2019-08-21 16:43:56 +08:00
KslrandGitHub 7fdecd0d6a add papers !cn 2019-08-21 16:17:22 +08:00
KslrandGitHub dbf2dbb6d6 Merge pull request #83 from m2kar/add-paper-site
Add paper sites
2019-08-21 16:16:40 +08:00
KslrandGitHub 27a66bf6be add papers 2019-08-21 16:13:35 +08:00
KslrandGitHub a8f20a4217 Delete papers 2019-08-21 16:12:10 +08:00
KslrandGitHub 49e5d62e8a Merge pull request #85 from akiirui/master
Add huya
2019-08-20 09:49:21 +08:00
KslrandGitHub 43c9402160 Merge pull request #84 from akiirui/master
tencent: remove duplicate qqmail.com
2019-08-20 01:17:45 +08:00
KslrandGitHub 1f346a2f5d Merge pull request #82 from funray/master
Add some domains
2019-08-14 15:16:12 +08:00
KslrandGitHub 4e4a0050a4 Merge pull request #81 from wi1dcard/feature/netflix-domains
Add more Netflix domains.
2019-08-02 17:06:49 +08:00
KslrandGitHub f07c185abd Merge pull request #78 from banricho/master
update: xiaomitv-ads
2019-07-26 23:46:40 +08:00
KslrandGitHub 875cbc83ec Merge pull request #77 from ZQRui/patch-1
Add medium
2019-07-21 22:18:31 +08:00
KslrandGitHub a83710623f Merge pull request #76 from Kazetoyuki/master
geolocation-cn: remove v2ex.com
2019-07-16 12:18:57 +08:00
KslrandGitHub 12fd841fd1 Merge pull request #75 from SitiSchu/patch-1
Remove inactive domain, Add two new domains
2019-07-13 13:47:33 +08:00
KslrandGitHub 36e816e438 Merge pull request #74 from OpportunityLiu/patch-1
Update tencent
2019-07-12 22:38:05 +08:00