Commit Graph
100 Commits
Author SHA1 Message Date
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
Richard ChenandGitHub 10e08fb485 Merge pull request #173 from Zzqqbs/tmp-1
增加并更改一些内容
2020-01-17 18:07:14 +08:00
Richard ChenandGitHub d3336e5ddf Merge pull request #172 from Zzqqbs/tmp
添加一些国内站点
2020-01-17 18:06:57 +08:00
Richard ChenandGitHub 7cea91f12b Merge pull request #171 from Loyalsoldier/master
Add several common software development related websites and domains
2020-01-17 18:06:28 +08:00
Richard ChenandGitHub 0132e18dda Merge pull request #168 from Loyalsoldier/update-yyets
Update yyets sub-list
2020-01-15 20:18:33 +08:00
Richard ChenandGitHub 7410c24cb8 Merge pull request #167 from Loyalsoldier/master
Add netlify sub-list into geolocation-!cn category
2020-01-15 12:06:41 +08:00
Richard ChenandGitHub 5179045258 Merge pull request #169 from Loyalsoldier/update-google
Update & sort google sub-list
2020-01-15 12:05:40 +08:00
Richard ChenandGitHub 8f27ae44a2 Merge pull request #170 from Loyalsoldier/update-yahoo
Update & sort yahoo sub-list
2020-01-15 12:05:31 +08:00
Richard ChenandGitHub b512f1131d Merge pull request #166 from iochen/master
reclassify yyets set
fix #162 @Loyalsoldier
2020-01-12 20:10:37 +08:00
Richard Chen eb4644b666 reclassify yyets set 2020-01-12 20:07:38 +08:00
Richard ChenandGitHub 5398849450 Merge pull request #164 from Loyalsoldier/master
Refine regex and sort github sub-list
2020-01-12 19:50:17 +08:00
Richard ChenandGitHub c900731fca fix a bug
regex not regexp
2020-01-12 18:39:13 +08:00
Richard ChenandGitHub ffc8c069b2 Merge pull request #162 from Zzqqbs/tmp
Create yyets and yyets-ads
2020-01-12 18:35:54 +08:00
Richard ChenandGitHub 3ec4b92709 Merge pull request #163 from Loyalsoldier/master
Add dozens of domains
2020-01-12 18:35:13 +08:00
Richard ChenandGitHub b604498349 Merge pull request #161 from Loyalsoldier/add-zeit
Add zeit sub-list to geolocation-!cn
2020-01-12 10:00:14 +08:00
Richard ChenandGitHub 3817032180 Merge pull request #157 from Loyalsoldier/master
Sort category-ads & category-ads-all
2020-01-11 18:09:36 +08:00
Richard ChenandGitHub 87dde9923b Merge pull request #158 from Loyalsoldier/ookla-speedtest
Regenerate ookla-speedtest list
2020-01-11 18:08:54 +08:00
Richard ChenandGitHub 73ccb167d8 Merge pull request #141 from Loyalsoldier/action
Add workflow
2020-01-05 11:49:38 +08:00
Richard ChenandGitHub ba850fc089 Merge pull request #142 from iochen/master
Add porn set
2020-01-05 11:34:41 +08:00
Richard Chen 79119e7fe4 Add porn set 2020-01-05 11:32:37 +08:00
Richard ChenandGitHub 205065bb22 Merge pull request #140 from mzz2017/patch-1
add "dogedoge.com"
2020-01-05 08:01:10 +08:00
Richard ChenandGitHub a81ae0784a Merge pull request #135 from Loyalsoldier/master
add some domains
2019-12-28 18:09:39 +08:00
Richard ChenandGitHub 935e337453 Merge pull request #131 from iochen/master
replace CRLF to LF
Fix #129
2019-12-21 20:49:40 +08:00
Richard Chen 63b8123301 replace CRLF to LF 2019-12-21 20:47:37 +08:00
Richard ChenandGitHub e6991a00e4 Merge pull request #111 from ilouiss/master
add some domains
2019-11-23 21:00:35 +08:00
Richard ChenandGitHub 30bd91ea37 Merge pull request #105 from forever8938/master
add more domains
2019-11-03 12:57:15 +08:00
Richard ChenandGitHub 5ecaad49b7 Add sub domains
sub domains are also needed
2019-10-04 20:26:23 +08:00
Richard Chen 369539ed6b add more domains 2019-10-02 22:14:21 +08:00
Richard Chen 7e2f9c1249 add some microsoft domains 2019-10-02 21:55:32 +08:00
Richard Chen b0c900cc21 modify acplay data 2019-08-27 08:33:28 +08:00
Richard ChenandGitHub b4c92874ec Merge pull request #90 from felixonmars/patch-1
Rename file to fix data generation
2019-08-23 15:05:46 +08:00
Richard Chen 6926783369 Add some wikimedia domains. 2019-08-22 09:38:27 +08:00
Richard ChenandGitHub 5c0863cb4c Merge pull request #80 from funray/master
Add steemit
2019-07-31 12:05:26 +08:00
Richard ChenandGitHub 741e0c8605 Merge pull request #79 from funray/master
Add some domains
2019-07-30 08:17:47 +08:00
Richard ChenandGitHub 701fe87b64 Merge pull request #72 from funray/master
常规更新
2019-07-13 22:27:23 +08:00
Richard ChenandGitHub dca1c81e0e Merge pull request #70 from banricho/master
Create XiaomiTV-ads
2019-06-27 21:13:08 +08:00
Richard Chen 2a9a92aa88 move file 2019-05-19 12:24:30 +08:00
Richard Chen fc133aa216 Merge remote-tracking branch 'upstream/master' 2019-05-19 12:17:31 +08:00
Richard ChenandGitHub bf25a25f5f Merge pull request #59 from bososha/master
add  dmm-ads
2019-05-07 12:02:03 +08:00
Richard Chen 91c6aefdfe Merge remote-tracking branch 'upstream/master' 2019-04-19 21:21:26 +08:00
Richard Chen a80c8c5e05 add ads and ibm 2019-03-28 12:15:14 +08:00
Richard ChenandGitHub 175ae9652e Merge pull request #51 from evansan/master
add apple ads
2019-03-28 11:39:23 +08:00