Commit Graph
100 Commits
Author SHA1 Message Date
Richard ChenandGitHub 54f7858345 Merge pull request #347 from EpLiar/update-qihoo360
Update qihoo360
2020-04-19 17:47:08 +08:00
Richard ChenandGitHub 9e3e4250e7 Merge pull request #342 from EpLiar/add-58tongcheng
Add 58tongcheng
2020-04-17 18:41:21 +08:00
Richard ChenandGitHub e897ce2eca Merge pull request #341 from EpLiar/update-geolocation-cn
Update 4399, geolocation-cn and qihoo360
2020-04-16 18:33:51 +08:00
Richard ChenandGitHub df4bef7e7b Merge pull request #338 from rhjdvsgsgks/patch-2
Update bilibili
2020-04-15 18:42:50 +08:00
Richard ChenandGitHub f6817825b8 Merge pull request #339 from EpLiar/add-4399
Add 4399, hupu, jinshuju and teambition. Update geolocation-cn.
2020-04-15 18:38:28 +08:00
Richard ChenandGitHub 8f70c70c9e Merge pull request #336 from Loyalsoldier/update-nintendo
Update nintendo
2020-04-14 12:53:31 +08:00
Richard ChenandGitHub 227e43a908 Merge pull request #335 from Loyalsoldier/add-hbo
Include hbo into geolocation-!cn category
2020-04-14 12:51:55 +08:00
Richard ChenandGitHub 5c32743b8c Merge pull request #334 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-04-13 12:42:38 +08:00
Richard ChenandGitHub 47bcdec0fd Merge pull request #333 from Loyalsoldier/add-speedtest
Fix: geosite:speedtest not found error
2020-04-12 20:04:17 +08:00
Richard ChenandGitHub 1b0efbf3ff Merge pull request #332 from Loyalsoldier/add-swisssign
Include swisssign into geolocation-!cn
2020-04-12 20:03:25 +08:00
Richard ChenandGitHub 2c6a7b93c2 Merge pull request #331 from Loyalsoldier/update-cloudflare
Update cloudflare
2020-04-12 17:19:34 +08:00
Richard ChenandGitHub eb06fca688 Merge pull request #329 from Loyalsoldier/update-guo
Update guo
2020-04-12 17:16:45 +08:00
Richard ChenandGitHub f14604f54c Merge pull request #330 from Loyalsoldier/add-digitalocean
Include digitalocean into geolocation-!cn category
2020-04-12 17:14:38 +08:00
Richard ChenandGitHub 703fea7439 Merge pull request #328 from Loyalsoldier/update-google
Update google
2020-04-11 18:52:41 +08:00
Richard ChenandGitHub c7740b7933 Merge pull request #323 from EpLiar/add-meitu-and-oppo
add meitu and oppo, modified geolocation-cn
2020-04-09 12:16:50 +08:00
Richard ChenandGitHub 0c1e9eff4c Merge pull request #322 from Loyalsoldier/update-oracle
Update oracle
2020-04-09 12:12:05 +08:00
Richard ChenandGitHub 45acedd19a Merge pull request #321 from Loyalsoldier/add-heroku
Include heroku into geolocation-!cn category
2020-04-09 12:11:39 +08:00
Richard ChenandGitHub 277f6cca2d Merge pull request #315 from Loyalsoldier/add-devs
Add dozens of software development related domains
2020-04-08 18:24:38 +08:00
Richard ChenandGitHub 9a35010e8c Merge pull request #316 from Loyalsoldier/update-microsoft
Update microsoft
2020-04-08 18:20:21 +08:00
Richard ChenandGitHub 31ef4f38e7 Merge pull request #317 from Loyalsoldier/add-services
Include osdn & sourceforge into geolocation-!cn category
2020-04-08 18:19:57 +08:00
Richard ChenandGitHub 096b66aeb0 Merge pull request #318 from Loyalsoldier/update-godaddy
Update godaddy
2020-04-08 18:19:10 +08:00
Richard ChenandGitHub 1377965fd6 Merge pull request #313 from EpLiar/update-qihoo360
Update qihoo360, netease and geolocation-cn
2020-04-07 22:46:44 +08:00
Richard ChenandGitHub f83abb608c Merge pull request #307 from Loyalsoldier/add-entertainment
Include playstation & nintendo into geolocation-!cn category
2020-04-07 19:17:36 +08:00
Richard ChenandGitHub 087a08a466 Merge pull request #309 from Loyalsoldier/update-microsoft
Update microsoft
2020-04-07 19:17:06 +08:00
Richard ChenandGitHub 6a5a15a0ff Merge pull request #306 from Loyalsoldier/update-google
Update google related domains
2020-04-07 12:16:55 +08:00
Richard ChenandGitHub 4d9fde748a Merge pull request #300 from Loyalsoldier/update-microsoft
Update microsoft
2020-04-06 20:54:45 +08:00
Richard ChenandGitHub 8dae50548d Merge pull request #301 from Loyalsoldier/update-netlify
Update netlify
2020-04-06 20:53:47 +08:00
Richard ChenandGitHub 2bc525a876 Merge pull request #304 from Loyalsoldier/update-yandex
Update yandex
2020-04-06 20:53:39 +08:00
Richard ChenandGitHub dd123cbd47 Merge pull request #292 from Loyalsoldier/update-amazon
Update amazon
2020-04-06 20:52:23 +08:00
Richard ChenandGitHub ec33d50978 Merge pull request #291 from Loyalsoldier/update-adobe
Update adobe
2020-04-06 20:51:57 +08:00
Richard ChenandGitHub 0a2abf8278 Merge pull request #293 from Loyalsoldier/update-apple
Update apple
2020-04-06 20:49:55 +08:00
Richard ChenandGitHub bcfd9be7d1 Merge pull request #294 from Loyalsoldier/update-cloudflare
Update cloudflare
2020-04-06 20:49:48 +08:00
Richard ChenandGitHub 6c2c7fa075 Merge pull request #295 from Loyalsoldier/update-fastly
Update fastly
2020-04-06 20:49:02 +08:00
Richard ChenandGitHub 3f344884d2 Merge pull request #296 from Loyalsoldier/update-flickr
Update flickr
2020-04-06 20:48:06 +08:00
Richard ChenandGitHub 5a4d4ea606 Merge pull request #297 from Loyalsoldier/update-gitlab
Update gitlab
2020-04-06 20:47:51 +08:00
Richard ChenandGitHub 797dc56b82 Merge pull request #298 from Loyalsoldier/update-godaddy
Update godaddy
2020-04-06 20:47:36 +08:00
Richard ChenandGitHub b69d9a7816 Merge pull request #299 from Loyalsoldier/update-ibm
Update ibm
2020-04-06 20:42:45 +08:00
Richard ChenandGitHub a3d89a3df8 Merge pull request #302 from Loyalsoldier/update-oracle
Update oracle
2020-04-06 20:40:36 +08:00
Richard ChenandGitHub 84c0da8bff Merge pull request #303 from Loyalsoldier/update-samsung
Update samsung
2020-04-06 20:39:58 +08:00
Richard ChenandGitHub 32ebaa1571 Merge pull request #305 from EpLiar/update-jd
update jd and geolocation-cn
2020-04-06 20:39:37 +08:00
Richard ChenandGitHub 307e745680 Merge pull request #290 from EpLiar/add-csdn
add csdn, update geolocation-cn
2020-04-06 18:15:14 +08:00
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