Commit Graph
100 Commits
Author SHA1 Message Date
Richard ChenandGitHub d6cf0df6bb Merge pull request #288 from EpLiar/add-shunfeng
add shunfeng, modified geolocation-cn
2020-04-06 07:57:18 +08:00
Richard ChenandGitHub 473481b9af Merge pull request #287 from Loyalsoldier/remove-speedtest
Remove speedtest related code due to #285
2020-04-06 07:32:06 +08:00
Richard ChenandGitHub c002c0a435 Merge pull request #283 from Loyalsoldier/update-guo
Update guo
2020-04-04 21:14:29 +08:00
Richard ChenandGitHub 9e76516c24 Merge pull request #282 from Loyalsoldier/update-!cn
Include kingkonglive into geolocation-!cn category
2020-04-04 21:13:35 +08:00
Richard ChenandGitHub 3425f77f9d Merge pull request #281 from flxxyz/master
Create kingkong-live
2020-04-02 07:14:52 +08:00
Richard ChenandGitHub 03cc4e834c Merge pull request #278 from Loyalsoldier/add-services
Include linguee into geolocation-!cn category
2020-04-01 23:00:33 +08:00
Richard ChenandGitHub d00ad6d617 Merge pull request #277 from Loyalsoldier/update-mozilla
Update mozilla
2020-03-31 18:36:36 +08:00
Richard ChenandGitHub bd5b6dd91b Merge pull request #274 from Loyalsoldier/add-entertainment
Include moov & viu into geolocation-!cn category
2020-03-30 22:23:17 +08:00
Richard ChenandGitHub a0e0842d4b Merge pull request #276 from Loyalsoldier/add-media
Include several media into category-media
2020-03-30 22:22:03 +08:00
Richard ChenandGitHub 96c155359c Merge pull request #273 from Loyalsoldier/update-cloudflare
Update cloudflare
2020-03-26 22:51:43 +08:00
Richard ChenandGitHub 79b5a5b62d Merge pull request #272 from Loyalsoldier/add-cdns
Include several CDNs into geolocation-!cn category
2020-03-24 16:30:00 +08:00
Richard ChenandGitHub cdc1826743 Merge pull request #270 from Loyalsoldier/add-devs
Include several dev related domains into geolocation-!cn category
2020-03-22 23:14:26 +08:00
Richard ChenandGitHub d42477d6b2 Merge pull request #267 from Loyalsoldier/update-microsoft
Update microsoft sub-list
2020-03-22 14:37:32 +08:00
Richard ChenandGitHub dc88adf1a0 Merge pull request #266 from Loyalsoldier/Add-privacytools
Include privacytools into category-anticensorship
2020-03-21 18:58:01 +08:00
Richard ChenandGitHub fe2e3bd75e Merge pull request #264 from Loyalsoldier/add-porn
Include several porn sites into category-porn
2020-03-18 07:14:50 +08:00
Richard ChenandGitHub f24564abc8 Merge pull request #265 from Loyalsoldier/add-dmm
Include dmm into geolocation-!cn category
2020-03-18 07:14:44 +08:00
Richard ChenandGitHub 820a3b17ed Merge pull request #263 from junjieyuan/add-sfacg
add sfacg
2020-03-16 14:26:29 +08:00
Richard ChenandGitHub c6e4a5c5b1 Merge pull request #262 from Loyalsoldier/update-pornhub
Update pornhub
2020-03-14 16:43:39 +08:00
Richard ChenandGitHub ef06df9dbf Merge pull request #261 from Loyalsoldier/master
Update workflow
2020-03-13 07:18:54 +08:00
Richard ChenandGitHub 718cfeb87a Merge pull request #260 from rhjdvsgsgks/patch-1
Update sina
2020-03-12 15:17:07 +08:00
Richard ChenandGitHub 49b2d99534 Merge pull request #259 from Loyalsoldier/add-arxiv
Include arxiv into geolocation-!cn category
2020-03-11 11:49:55 +08:00
Richard ChenandGitHub 0b24d4cc0a Merge pull request #258 from Loyalsoldier/master
Move jiguang sub-list back to data folder
2020-03-10 22:38:46 +08:00
Richard ChenandGitHub e8298859ff Merge pull request #256 from ToutyRater/patch-2
Add more domains
2020-03-10 22:14:10 +08:00
Richard ChenandGitHub 3ad2c0f06d Merge pull request #257 from zhonghaoxie/patch-1
Add Some Chinese TLDs
2020-03-10 22:01:59 +08:00
Richard ChenandGitHub e8d0e7745b Merge pull request #254 from Loyalsoldier/update-disney
Update disney sub-list
2020-03-10 13:46:20 +08:00
Richard ChenandGitHub 1a25908161 Merge pull request #253 from ToutyRater/master
Add more domains
2020-03-10 09:47:14 +08:00
Richard ChenandGitHub 25e009ec11 Merge pull request #252 from Loyalsoldier/add-flickr
Include flickr into yahoo sub-list
2020-03-08 14:48:53 +08:00
Richard ChenandGitHub 9f0c1a80af Merge pull request #251 from Loyalsoldier/update-adobe
Update adobe sub-list
2020-03-08 14:48:41 +08:00
Richard ChenandGitHub 93fc6b208b Merge pull request #250 from Loyalsoldier/update-!cn
Include several sub-lists into geolocation-!cn category
2020-03-08 14:48:29 +08:00
Richard ChenandGitHub 24d4acd9de Merge pull request #249 from Loyalsoldier/update-netease
Update netease sub-list
2020-03-07 17:18:38 +08:00
Richard ChenandGitHub 803633223a Merge pull request #248 from ToutyRater/master
Add more domains
2020-03-06 23:31:14 +08:00
Richard ChenandGitHub bad40dab02 Merge pull request #246 from Loyalsoldier/update-media
Include several media into category-media
2020-03-05 22:16:33 +08:00
Richard ChenandGitHub 8a1a94b551 Merge pull request #247 from Loyalsoldier/update-vpnservices
Include justmysocks into category-vpnservices
2020-03-05 22:14:33 +08:00
Richard ChenandGitHub 0ca3b34c20 Merge pull request #244 from Loyalsoldier/update-media
Include zerohedge & realvision into category-media
2020-03-05 21:02:49 +08:00
Richard ChenandGitHub 0d628fac87 Merge pull request #245 from Loyalsoldier/add-services
Include addthis & addtoany to geolocation-!cn category
2020-03-05 21:02:35 +08:00
Richard ChenandGitHub 44cb6261b5 Merge pull request #243 from TechCiel/patch-1
update list apple
2020-03-05 11:37:23 +08:00
Richard ChenandGitHub ca6bcde8bb Merge pull request #242 from Loyalsoldier/update-ca
Include verisign into geolocation-!cn category
2020-03-04 19:27:24 +08:00
Richard ChenandGitHub d1a22ef738 Merge pull request #241 from TechCiel/patch-1
update list apple
2020-03-04 11:58:31 +08:00
Richard ChenandGitHub d4f3a5e470 Merge pull request #239 from funray/patch-1
Update protonmail
2020-03-03 20:13:18 +08:00
Richard ChenandGitHub d1c004599f Merge pull request #234 from Loyalsoldier/master
Use official github release action & refine workflow
2020-02-27 19:58:19 +08:00
Richard ChenandGitHub 547fb309cd Merge pull request #233 from Loyalsoldier/master
Add protonmail & cnbc & refine categories in geolocation-!cn
2020-02-27 16:50:17 +08:00
Richard ChenandGitHub 068d90ad74 Merge pull request #232 from Loyalsoldier/fix231
Fix #231 : use another github release action
2020-02-26 23:15:35 +08:00
Richard ChenandGitHub 47301a2d9a Merge pull request #230 from Loyalsoldier/update-go
Upgrade workflow to go v1.14
2020-02-26 22:22:57 +08:00
Richard ChenandGitHub d060495072 Merge pull request #228 from Loyalsoldier/update-geolocation-!cn
Include watchout & citizenlab into geolocation-!cn category
2020-02-26 17:35:03 +08:00
Richard ChenandGitHub 55c3825a50 Merge pull request #229 from Loyalsoldier/update-vpnservices
Update category-vpnservices
2020-02-26 17:34:03 +08:00
Richard ChenandGitHub e053ff2674 Merge pull request #226 from rhjdvsgsgks/patch-1
Include xdty & xingrz into geolocation-cn category
2020-02-26 07:08:54 +08:00
Richard ChenandGitHub 42de29f933 Merge pull request #225 from rhjdvsgsgks/master
add applovin-ads & uberads-ads & inner-active-ads
2020-02-25 23:11:53 +08:00
Richard ChenandGitHub 08bad7816e Merge pull request #223 from Loyalsoldier/master
Fix #222 : move mopub-ads back to data directory
2020-02-25 21:58:40 +08:00
Richard ChenandGitHub fa2cde1acf Merge pull request #221 from rhjdvsgsgks/patch-1
include acplay to geolocation-cn & add mopub-ads & update yahoo-ads & include adcolony-ads to category-ads
2020-02-25 21:40:18 +08:00
Richard ChenandGitHub 1ab8e51846 Merge pull request #219 from Loyalsoldier/master
Add cloudflare & several CAs into geolocation-!cn category
2020-02-25 17:03:49 +08:00
Richard ChenandGitHub 40f7925131 Merge pull request #217 from hiiragiyuriko/patch-1
Include ChaoXing into geolocation-cn category
2020-02-25 16:20:23 +08:00
Richard ChenandGitHub a3645cd050 Merge pull request #216 from Loyalsoldier/master
Update voanews sub-list
2020-02-25 16:18:33 +08:00
Richard ChenandGitHub 98f8339941 Merge pull request #215 from Loyalsoldier/master
Add & remove several sub-lists
2020-02-25 12:28:02 +08:00
Richard ChenandGitHub 4cb84e8a42 Merge pull request #213 from iochen/master
Add jd domains
2020-02-13 20:19:47 +08:00
Richard Chen 61c78122ec Add jd domains 2020-02-13 17:25:43 +08:00
Richard ChenandGitHub 127b9c6379 Merge pull request #212 from iochen/master
add jd domains
2020-02-12 23:04:25 +08:00
Richard Chen f7b931ef93 Merge branch 'master' of github.com:iochen/domain-list-community 2020-02-12 18:25:33 +08:00
Richard Chen 0780e534c0 add jd domains 2020-02-12 18:23:54 +08:00
Richard ChenandGitHub 84fa9fa91a Merge pull request #211 from iochen/master
add some cloud-school domains
2020-02-12 09:08:42 +08:00
Richard Chen 1ed2c66b72 add some cloud-school domains 2020-02-11 20:10:25 +08:00
Richard ChenandGitHub 808c010628 Merge pull request #210 from iochen/master
Update domains
2020-02-10 09:52:22 +08:00
Richard Chen 8b1dd5ce94 remove duplicate data 2020-02-10 09:20:56 +08:00
Richard Chen d59d2d9ad2 add china{mobile, telecom, unicom} 2020-02-10 09:15:55 +08:00
Richard ChenandGitHub 7c4b0c2f22 Update netease 2020-02-09 22:15:13 +08:00
Richard ChenandGitHub 76c5893eb7 Merge pull request #208 from iochen/master
generate ookla-speedtest via go
2020-02-09 18:38:41 +08:00
Richard Chen 94e0310748 Revert "add UA"
This reverts commit 157b7292a3.
2020-02-09 18:26:35 +08:00
Richard Chen 157b7292a3 add UA 2020-02-09 18:20:07 +08:00
Richard Chen 02989df3cc Merge remote-tracking branch 'upstream/master' 2020-02-09 18:06:32 +08:00
Richard Chen 8e05324f36 generate ookla-speedtest via go 2020-02-09 18:00:25 +08:00
Richard ChenandGitHub a61e68810a Merge pull request #207 from Loyalsoldier/master
Include change sub-list into geolocation-!cn category
2020-02-09 07:46:20 +08:00
Richard ChenandGitHub 690cae8369 Merge pull request #206 from Loyalsoldier/refine-readme
Fix typos & refine README.md
2020-02-08 16:02:22 +08:00
Richard ChenandGitHub 5a0b2a6e1f Merge pull request #205 from Loyalsoldier/master
Include chinapower & csis into geolocation-!cn category
2020-02-08 14:29:20 +08:00
Richard ChenandGitHub cfd5d41da0 Merge pull request #204 from Loyalsoldier/master
Create category-vpnservices & add dozens of VPN services related domains
2020-02-05 23:15:53 +08:00
Richard ChenandGitHub 66a3516443 Merge pull request #202 from rhjdvsgsgks/patch-1
Create adcolony-ads
2020-02-05 21:31:24 +08:00
Richard ChenandGitHub 1c60b3f12b Merge pull request #203 from rhjdvsgsgks/patch-2
Update google-ads
2020-02-05 21:30:51 +08:00
Richard ChenandGitHub 237355756e Merge pull request #201 from Loyalsoldier/master
Add several porn sub-lists into category-porn
2020-02-05 11:23:27 +08:00
Richard ChenandGitHub ca11634592 Merge pull request #199 from iochen/master
fix #198
2020-02-01 18:20:13 +08:00
Richard Chen 0d08234159 add 'Accept-Encoding: gzip' header 2020-02-01 18:16:54 +08:00
Richard Chen 55a46dbbc2 Merge branch 'iochen-master' 2020-02-01 09:17:45 +08:00
Richard Chen 34dc748839 auto generate every Wed. 2020-02-01 09:12:48 +08:00
Richard ChenandGitHub 6a0f331df4 Merge pull request #195 from Loyalsoldier/master
Add several organizations into geolocation-!cn category
2020-01-29 18:50:15 +08:00
Richard Chen 95371ab4fd Merge branch 'Loyalsoldier-patch-1' 2020-01-28 19:35:48 +08:00
Richard ChenandGitHub 6dfc13a2ed Merge pull request #193 from Loyalsoldier/master
Refine ookla-speedtest hosts generation script using Perl
2020-01-28 08:13:48 +08:00
Richard ChenandGitHub 0733a30d0a Merge pull request #192 from Loyalsoldier/master
Include hp & ibm & nvidia sub-list into geolocation-!cn category
2020-01-26 22:01:48 +08:00
Richard ChenandGitHub 64d84d5405 Merge pull request #190 from Loyalsoldier/master
Refine unity sub-list & reclassify pubmatic and unity sub-list
2020-01-26 16:32:25 +08:00
Richard ChenandGitHub 7f02707225 Merge pull request #191 from Loyalsoldier/resort
Resort several sub-lists
2020-01-26 16:32:11 +08:00
Richard ChenandGitHub 2ab2aa0afe Merge pull request #188 from Loyalsoldier/master
Scheduled update moved from azure pipelines to GitHub Actions
2020-01-26 13:56:32 +08:00
Richard ChenandGitHub 2f62411a58 Merge pull request #189 from Zzqqbs/tmp
请求合并!
2020-01-26 13:52:29 +08:00
Richard ChenandGitHub 491c1b5cf1 Merge pull request #187 from Loyalsoldier/speedtest
Automatically generate ookla-speedtest sub-list from source
2020-01-25 21:28:48 +08:00
Richard ChenandGitHub e7b6a610aa Merge pull request #184 from Loyalsoldier/update-porn
Update & refine several porn sub-list
2020-01-23 09:49:39 +08:00
Richard ChenandGitHub 22bc255158 Merge pull request #185 from Loyalsoldier/master
Add lihkg & rthk sub-list into geolocation-!cn category
2020-01-23 09:47:39 +08:00
Richard ChenandGitHub 101dca0c93 Merge pull request #182 from Loyalsoldier/patch-1
Update google sub-list
2020-01-21 21:32:00 +08:00
Richard ChenandGitHub ad4df1650c Merge pull request #181 from Loyalsoldier/add-imgur
Add imgur sub-list into geolocation-!cn category
2020-01-20 07:45:45 +08:00
Richard ChenandGitHub ae083d6217 Merge pull request #180 from Loyalsoldier/update-stackexchange
Update & sort stackexchange sub-list
2020-01-20 07:45:29 +08:00
Richard ChenandGitHub e10f7e5913 Merge pull request #177 from Loyalsoldier/update-dropbox
Update & sort dropbox sub-list
2020-01-20 07:45:12 +08:00
Richard ChenandGitHub 97bf5b552a Merge pull request #179 from Loyalsoldier/update-speedtest
Regenerate ookla-speedtest sub-list with lower-cased hosts
2020-01-20 07:45:00 +08:00
Richard ChenandGitHub e85a64d37c Merge pull request #178 from Loyalsoldier/update-adobe
Add typekit sub-list & update adobe sub-list
2020-01-20 07:44:42 +08:00
Richard ChenandGitHub 2b02f562d8 Merge pull request #176 from Zzqqbs/ad
增加一些广告域
2020-01-18 19:18:59 +08:00
Richard ChenandGitHub de89f61eed Merge pull request #174 from Loyalsoldier/master
Refine & sort mozilla related sub-list
2020-01-18 09:04:17 +08:00
Richard ChenandGitHub e5e6e00f7a Merge pull request #175 from Loyalsoldier/update-cowtransfer
Refine & add cowtransfer in geolocation-cn category
2020-01-18 09:03:44 +08:00