Commit Graph
100 Commits
Author SHA1 Message Date
Richard ChenandGitHub 7f45119d91 Merge pull request #604 from LamJH/create-aljazeera
Create Al Jazeera
2020-07-14 09:36:22 +08:00
Richard ChenandGitHub 758c50da50 Merge pull request #603 from Loyalsoldier/add-media
Include dailymail into category-media
2020-07-14 09:35:00 +08:00
Richard ChenandGitHub 9e23e0fa3a Merge pull request #605 from LamJH/update-wikimedia
Update Wikimedia
2020-07-14 09:34:03 +08:00
Richard ChenandGitHub b92536149c Merge pull request #595 from Loyalsoldier/update-readme
Refine README
2020-07-12 11:58:51 +08:00
Richard ChenandGitHub ba9e07401c Merge pull request #594 from EpLiar/create-dell
Create dell
2020-07-12 11:41:54 +08:00
Richard ChenandGitHub ad902d31cd Merge pull request #596 from Loyalsoldier/refine-workflow
Refine workflow
2020-07-12 11:41:29 +08:00
Richard ChenandGitHub ef63409bf2 Merge pull request #588 from EpLiar/update-playstation
Update playstation
2020-07-11 11:00:04 +08:00
Richard ChenandGitHub 0d7f3f759b Merge pull request #586 from EpLiar/create-lanzou
Create lanzou
2020-07-11 10:59:22 +08:00
Richard ChenandGitHub 01c5c1be0c Merge pull request #587 from EpLiar/create-canon
Create canon
2020-07-11 10:58:31 +08:00
Richard ChenandGitHub 738a22937c Rename warroom to data/warroom 2020-07-10 11:54:29 +08:00
Richard ChenandGitHub 29b9be3851 Merge pull request #572 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-10 11:45:15 +08:00
Richard ChenandGitHub 53db6df2d5 Merge pull request #571 from EpLiar/create-xueersi
Create xueersi
2020-07-10 11:43:52 +08:00
Richard ChenandGitHub 3693fd4562 Merge pull request #573 from Loyalsoldier/update-media
Include warroom into category-media
2020-07-10 11:43:15 +08:00
Richard ChenandGitHub 8cd9c38c19 Merge pull request #570 from EpLiar/update-nvidia
Update nvidia
2020-07-09 22:47:58 +08:00
Richard ChenandGitHub e1f99e097b Merge pull request #569 from EpLiar/create-intel
Create intel
2020-07-09 21:52:40 +08:00
Richard ChenandGitHub fee0399ac9 Merge pull request #567 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-09 15:42:37 +08:00
Richard ChenandGitHub 88ca105668 Merge pull request #565 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-09 12:39:36 +08:00
Richard ChenandGitHub 82508df080 Merge pull request #566 from EpLiar/create-taikang
Create taikang
2020-07-09 12:38:43 +08:00
Richard ChenandGitHub dd5315e117 Merge pull request #564 from iochen/iochen-patch-1
remove steam from geolocation-cn
2020-07-08 20:52:54 +08:00
Richard ChenandGitHub b2a0c095ac Update geolocation-cn 2020-07-08 20:50:20 +08:00
Richard ChenandGitHub 62fd2ce9ea Merge pull request #2 from v2ray/master
update
2020-07-08 20:49:21 +08:00
Richard ChenandGitHub 33a92caec1 Merge pull request #563 from iochen/iochen-patch-1
fix error
2020-07-08 20:15:11 +08:00
Richard ChenandGitHub b4a8767072 Update geolocation-cn 2020-07-08 20:13:44 +08:00
Richard ChenandGitHub 1a2e477470 Merge pull request #1 from v2ray/master
update
2020-07-08 20:12:39 +08:00
Richard ChenandGitHub fb3c0c742f Merge pull request #561 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-08 15:40:14 +08:00
Richard ChenandGitHub 30a3a8b56c Merge pull request #560 from Loyalsoldier/add-jfrog
Include jfrog into category-dev
2020-07-08 13:48:57 +08:00
Richard ChenandGitHub 93e1ad5cc9 Merge pull request #559 from EpLiar/create-cctv
Create cctv
2020-07-08 10:22:55 +08:00
Richard ChenandGitHub ba4e849206 Merge pull request #558 from Loyalsoldier/add-bbgwatch
Include bbgwatch into category-media
2020-07-08 07:39:36 +08:00
Richard ChenandGitHub a5f4ecf37e Merge pull request #495 from rhjdvsgsgks/patch-1
add some advertising domains
2020-07-08 07:39:08 +08:00
Richard ChenandGitHub 239a305fb1 Merge pull request #556 from EpLiar/create-keep
Create keep
2020-07-07 23:48:22 +08:00
Richard ChenandGitHub 715cfb6b23 Merge pull request #557 from EpLiar/update-vimeo
Update vimeo
2020-07-07 23:47:31 +08:00
Richard ChenandGitHub b8ee1e2d03 Merge pull request #553 from Loyalsoldier/update-youku-ads
Remove vali.cp31.ott.cibntv.net from youku-ads
2020-07-07 18:13:37 +08:00
Richard ChenandGitHub b9d5be813d Merge pull request #550 from EpLiar/update-douyu
Update douyu
2020-07-07 07:58:06 +08:00
Richard ChenandGitHub 6d35436e3b Merge pull request #551 from EpLiar/create-zoom
Create zoom
2020-07-07 07:55:24 +08:00
Richard ChenandGitHub bebbc08725 Merge pull request #549 from EpLiar/Update-nintendo
Update nintendo
2020-07-06 16:21:34 +08:00
Richard ChenandGitHub bad4c5088e Merge pull request #547 from EpLiar/update-amazon
Update amazon and sort
2020-07-06 15:10:02 +08:00
Richard ChenandGitHub 83051f45f1 Merge pull request #548 from EpLiar/update-9news
Update 9news
2020-07-06 15:09:49 +08:00
Richard ChenandGitHub cbf554db5d Merge pull request #546 from tritu/master
Update disney
2020-07-06 11:32:54 +08:00
Richard ChenandGitHub 144ef41d29 Merge pull request #545 from iochen/iochen-patch-1
avoid tag conflict
2020-07-06 10:21:11 +08:00
Richard ChenandGitHub df148365bb Update build.yml 2020-07-06 10:00:19 +08:00
Richard ChenandGitHub af309cfac6 Merge pull request #542 from LamJH/master
Update Steam
2020-07-06 09:56:18 +08:00
Richard ChenandGitHub ea60e0679d Merge pull request #543 from EpLiar/update-bestbuy
Update bestbuy and sort
2020-07-06 09:54:58 +08:00
Richard ChenandGitHub fde5ae1eae Merge pull request #544 from EpLiar/create-zuoyebang
Create zuoyebang
2020-07-06 09:54:33 +08:00
Richard ChenandGitHub f8519474f5 Merge pull request #530 from EpLiar/update-yahoo
Update yahoo
2020-07-04 12:00:40 +08:00
Richard ChenandGitHub 6ef26a6b5c Merge pull request #514 from tritu/master
Create sling
2020-06-25 17:44:09 +08:00
Richard ChenandGitHub 208d7d419a Merge pull request #502 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-06-21 20:21:19 +08:00
Richard ChenandGitHub c587c107fc Merge pull request #501 from rhjdvsgsgks/patch-2
Create biliplus
2020-06-14 19:01:17 +08:00
Richard ChenandGitHub 6809c9523e Merge pull request #476 from rhjdvsgsgks/patch-1
add nga
2020-06-08 12:12:32 +08:00
Richard ChenandGitHub adc38bc3ae Merge pull request #477 from DuckSoft/patch-2
添加米忽悠/崩坏3
2020-06-07 22:52:48 +08:00
Richard ChenandGitHub 2daf08f276 Merge pull request #466 from EpLiar/9CC63634
Update 51job, geolocation-cn and sina.
2020-06-06 21:34:44 +08:00
Richard ChenandGitHub b8ba573f2b Merge pull request #455 from EpLiar/D6E458
Update 4399 and geolocation-cn.
2020-06-03 12:40:42 +08:00
Richard ChenandGitHub d143fcae6b Merge pull request #452 from Loyalsoldier/update-!cn
Update geolocation-!cn category
2020-06-02 12:52:35 +08:00
Richard ChenandGitHub 062051bc30 Merge pull request #424 from DuckSoft/patch-1
Add QQ Loopback Address
2020-06-02 12:43:34 +08:00
Richard ChenandGitHub 2e48442b47 Merge pull request #451 from Loyalsoldier/update-google
Update google
2020-06-02 12:35:38 +08:00
Richard ChenandGitHub c91d928802 Merge pull request #450 from Loyalsoldier/update-netflix
Update netflix
2020-06-02 12:27:53 +08:00
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