Commit Graph
100 Commits
Author SHA1 Message Date
Richard ChenandGitHub db9805b8ea Merge pull request #411 from Loyalsoldier/update-scholar
Include google-scholar into category-scholar-!cn
2020-05-03 11:15:00 +08:00
Richard ChenandGitHub d1026c2844 Merge pull request #409 from Loyalsoldier/fix-ehentai
Fix ehentai: add newline & sort
2020-05-03 11:04:13 +08:00
Richard ChenandGitHub de7baa7cfd Merge pull request #410 from Loyalsoldier/update-!cn
Include nike into geolocation-!cn category
2020-05-03 11:03:50 +08:00
Richard ChenandGitHub ddef8f76d6 Merge pull request #407 from EpLiar/add-alibaba
Add and update.
2020-05-01 12:07:22 +08:00
Richard ChenandGitHub f083928801 Merge pull request #404 from LiJingqing/master
Add google-scholar.
2020-04-30 12:08:43 +08:00
Richard ChenandGitHub f9c4d67d88 Merge pull request #387 from Loyalsoldier/update-hbo
Update hbo
2020-04-29 23:03:08 +08:00
Richard ChenandGitHub 940ee2e44b Merge pull request #390 from Loyalsoldier/update-ibm
Update ibm
2020-04-29 23:02:34 +08:00
Richard ChenandGitHub 70c6a46bd0 Merge pull request #391 from Loyalsoldier/update-jwplayer
Update jwplayer
2020-04-29 23:02:26 +08:00
Richard ChenandGitHub 2749be9a75 Merge pull request #392 from Loyalsoldier/update-netflix
Update netflix
2020-04-29 23:02:10 +08:00
Richard ChenandGitHub ea2a3bccca Merge pull request #395 from Loyalsoldier/update-quora
Update quora
2020-04-29 23:02:04 +08:00
Richard ChenandGitHub cf12d8e7aa Merge pull request #400 from Loyalsoldier/update-zaobao
Update zaobao
2020-04-29 23:01:58 +08:00
Richard ChenandGitHub f82d961cc9 Merge pull request #403 from Loyalsoldier/update-yahoo
Update yahoo
2020-04-29 23:01:52 +08:00
Richard ChenandGitHub 2de3082899 Merge pull request #385 from Loyalsoldier/update-epicgames
Update epicgames
2020-04-29 23:01:03 +08:00
Richard ChenandGitHub 6581e98c10 Merge pull request #379 from Loyalsoldier/update-appledaily
Update appledaily
2020-04-29 22:59:35 +08:00
Richard ChenandGitHub 9d6cbaa508 Merge pull request #382 from Loyalsoldier/update-disney
Update disney
2020-04-29 22:58:25 +08:00
Richard ChenandGitHub 00b7f7e0aa Merge pull request #383 from Loyalsoldier/update-ebay
Update ebay
2020-04-29 22:58:08 +08:00
Richard ChenandGitHub 30b7399ee1 Merge pull request #380 from Loyalsoldier/update-applovin-ads
Update applovin-ads
2020-04-29 22:57:44 +08:00
Richard ChenandGitHub 9781947e24 Merge pull request #378 from Loyalsoldier/update-pinterest
Update pinterest
2020-04-29 22:57:18 +08:00
Richard ChenandGitHub df02f739e4 Merge pull request #377 from Loyalsoldier/master
Include twitch & hkedcity into geolocation-!cn category
2020-04-29 22:57:01 +08:00
Richard ChenandGitHub e54d523646 Merge pull request #402 from Loyalsoldier/feat-datapath
Feat: add --datapath flag for custom data folder
2020-04-29 21:50:43 +08:00
Richard ChenandGitHub 47fa5e85ed Merge pull request #374 from EpLiar/update-geolocation-cn
Update geolocation-cn, qihoo360 and xunlei.
2020-04-24 20:42:29 +08:00
Richard ChenandGitHub 660517093b Merge pull request #373 from Loyalsoldier/update-sina-ads
Update sina-ads
2020-04-24 12:51:02 +08:00
Richard ChenandGitHub fbbc9b6a18 Merge pull request #372 from Loyalsoldier/update-microsoft
Update microsoft
2020-04-24 12:50:36 +08:00
Richard ChenandGitHub 8f573da5f3 Merge pull request #370 from Loyalsoldier/update-readme
Add usage example
2020-04-23 12:57:54 +08:00
Richard ChenandGitHub 0536865b23 Merge pull request #367 from Loyalsoldier/refine-scholar
Rename scholar-!cn to category-scholar-!cn & merge sub-lists
2020-04-23 12:56:35 +08:00
Richard ChenandGitHub cccd8a8d46 Merge pull request #369 from Loyalsoldier/add-media
Include landofhope into category-media
2020-04-23 12:53:31 +08:00
Richard ChenandGitHub 13153afe8c Merge pull request #366 from 8DxFPT/master
Update scholar-!cn
2020-04-22 22:30:33 +08:00
Richard ChenandGitHub 47cc011902 Merge pull request #365 from Loyalsoldier/update-microsoft
Update microsoft
2020-04-22 18:49:00 +08:00
Richard ChenandGitHub b4d3d9c98a Merge pull request #361 from Loyalsoldier/update-!cn
Include several sub-lists into geolocation-!cn category
2020-04-21 20:49:01 +08:00
Richard ChenandGitHub 7dc50dda7b Merge pull request #360 from Loyalsoldier/add-media
Include newyorker & 9news into category-media
2020-04-21 20:48:12 +08:00
Richard ChenandGitHub c20c9c0e18 Merge pull request #362 from Loyalsoldier/update-dmm-ads
Update dmm-ads
2020-04-21 20:47:33 +08:00
Richard ChenandGitHub e6632da0a0 Merge pull request #363 from EpLiar/update-geolocation-cn
Update geolocation-cn and tencent
2020-04-21 20:46:14 +08:00
Richard ChenandGitHub d0d59ffab1 Merge pull request #364 from 8DxFPT/master
Create scholar-!cn
2020-04-21 20:44:42 +08:00
Richard ChenandGitHub 16400955b8 Merge pull request #356 from Loyalsoldier/update-amazon
Update amazon
2020-04-20 22:56:32 +08:00
Richard ChenandGitHub 8323df6bc9 Merge pull request #357 from Loyalsoldier/update-!cn
Include stripe & fonts & shopify into geolocation-!cn category
2020-04-20 22:55:11 +08:00
Richard ChenandGitHub 758609a2b8 Merge pull request #354 from EpLiar/add-ifanr
Add ifanr and suning, update jd and geolocation-cn.
2020-04-20 18:36:42 +08:00
Richard ChenandGitHub 6080b554a4 Merge pull request #350 from Loyalsoldier/add-salesforce
Include salesforce into geolocation-!cn category
2020-04-20 12:15:28 +08:00
Richard ChenandGitHub 058056e9a5 Merge pull request #353 from Loyalsoldier/update-cloudflare
Update cloudflare
2020-04-20 12:14:24 +08:00
Richard ChenandGitHub 1b253dcd59 Merge pull request #352 from Loyalsoldier/update-google-ad
Update google-ads
2020-04-20 12:14:06 +08:00
Richard ChenandGitHub e27d51466b Merge pull request #349 from EpLiar/Add-yunfanjiasu
Add yunfanjiasu, xunlei and liepin. Update geolocation-cn and qihoo360.
2020-04-20 12:13:39 +08:00
Richard ChenandGitHub 337fbd5880 Merge pull request #351 from Loyalsoldier/update-guo
Update guo
2020-04-20 12:11:48 +08:00
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