Commit Graph
100 Commits
Author SHA1 Message Date
KslrandGitHub 134219c8b7 Merge pull request #512 from Loyalsoldier/add-podcast
Include several podcasts into geolocation-!cn category
2020-06-23 21:05:20 +08:00
KslrandGitHub 08700d96b7 Merge pull request #510 from Loyalsoldier/add-niconico
Include niconico into geolocation-!cn category
2020-06-22 21:25:32 +08:00
KslrandGitHub 7ff73f86e0 Merge pull request #511 from Loyalsoldier/update-spotify
Update spotify
2020-06-22 21:25:18 +08:00
KslrandGitHub 946a162b7c Merge pull request #509 from realEthanZou/add-aisee-and-ottcn
add aisee and ottcn
2020-06-20 23:33:23 +08:00
KslrandGitHub 41fa9438b6 Merge pull request #508 from Loyalsoldier/add-voxmedia
Include voxmedia into category-media
2020-06-20 14:53:52 +08:00
KslrandGitHub 2b3c064985 Merge pull request #507 from Loyalsoldier/update-google
Update google
2020-06-20 14:53:02 +08:00
KslrandGitHub 3f333e61d5 Merge pull request #505 from Loyalsoldier/add-media
Include several media into category-media
2020-06-19 21:13:05 +08:00
KslrandGitHub 74635194ea Merge pull request #506 from Loyalsoldier/update-!cn
Include several sub-lists into geolocation-!cn category
2020-06-19 21:12:27 +08:00
KslrandGitHub c12f10b59a Merge pull request #504 from EpLiar/update-nike
Update nike
2020-06-19 16:02:32 +08:00
KslrandGitHub 2e412bac61 Merge pull request #499 from EpLiar/update-chinaunicom
Update chinaunicom
2020-06-13 15:30:48 +08:00
KslrandGitHub b6688e92bd Merge pull request #498 from EpLiar/update-geolocation-cn
Include sinopec into geolocation-cn
2020-06-12 17:06:05 +08:00
KslrandGitHub 58dc4a84d1 Merge pull request #497 from EpLiar/create-sinopec
Create sinopec
2020-06-12 17:05:39 +08:00
KslrandGitHub 751b1cc911 Merge pull request #496 from EpLiar/create-wjx
Create wjx
2020-06-12 09:44:03 +08:00
KslrandGitHub 29d2e22211 Merge pull request #494 from flylai/patch-1
Update yunfanjiasu
2020-06-11 18:27:24 +08:00
KslrandGitHub 7551015f93 Merge pull request #493 from EpLiar/update-geolocation-!cn
Update geolocation-!cn
2020-06-11 16:49:11 +08:00
KslrandGitHub b5be89a1e3 Merge pull request #492 from EpLiar/create-mastercard
Create mastercard
2020-06-11 16:17:36 +08:00
KslrandGitHub b2d248f261 Merge pull request #491 from EpLiar/update-ebay
Update ebay
2020-06-11 15:54:02 +08:00
KslrandGitHub fdd1b127d8 Merge pull request #490 from EpLiar/update-oracle
Update oracle
2020-06-11 15:35:42 +08:00
KslrandGitHub a6ff96e1ab Merge pull request #488 from EpLiar/update-chinatelecom
Update chinatelecom
2020-06-11 11:48:22 +08:00
KslrandGitHub 273c19d237 Merge pull request #486 from EpLiar/create-ctexcel
Create ctexcel.
2020-06-11 11:44:44 +08:00
KslrandGitHub b941021e9f Merge pull request #484 from EpLiar/update-ctrip
Update ctrip
2020-06-10 16:11:10 +08:00
KslrandGitHub fa8eb7793d Merge pull request #485 from EpLiar/create-starbucks
Create starbucks
2020-06-10 16:10:25 +08:00
KslrandGitHub b9ec24faed Merge pull request #483 from rhjdvsgsgks/patch-1
add erji.net
2020-06-10 13:55:36 +08:00
KslrandGitHub 32a1cd237c Merge pull request #481 from Loyalsoldier/update-dev
Include jupyter & readthedocs into category-dev
2020-06-09 11:54:08 +08:00
KslrandGitHub 369302336e Merge pull request #482 from Loyalsoldier/update-digitalocean
Update digitalocean
2020-06-09 11:53:24 +08:00
KslrandGitHub 75a570fa56 Merge pull request #480 from EpLiar/update-alibaba
Update alibaba
2020-06-08 19:01:10 +08:00
KslrandGitHub a4dec4fa2b Merge pull request #479 from Loyalsoldier/add-mega
Include mega into geolocation-!cn category
2020-06-08 10:33:38 +08:00
KslrandGitHub cb29ece749 Merge pull request #475 from Loyalsoldier/master
Update workflow
2020-06-06 11:40:49 +08:00
KslrandGitHub cedb091992 Merge pull request #470 from Loyalsoldier/update-zoho
Update zoho
2020-06-06 09:29:40 +08:00
KslrandGitHub 1b9094dc6e Merge pull request #471 from Loyalsoldier/update-alibaba
Update alibaba
2020-06-06 09:29:15 +08:00
KslrandGitHub 01381d118d Merge pull request #473 from EpLiar/update-yunfanjiasu
Update yunfanjiasu.
2020-06-06 09:26:15 +08:00
KslrandGitHub 5f978bf1f6 Merge pull request #474 from rhjdvsgsgks/patch-1
add manmanbuy
2020-06-06 09:23:52 +08:00
KslrandGitHub c0ca0a617c Merge pull request #469 from EpLiar/update-alibaba
Update alibaba, move teambition into alibaba.
2020-06-05 16:30:07 +08:00
KslrandGitHub 9555f768c1 Merge pull request #461 from EpLiar/186354BD
Update 58tongcheng, geolocation-cn and jd.
2020-06-05 06:22:30 +08:00
KslrandGitHub 16003d229a Merge pull request #464 from Loyalsoldier/add-urlshortener
Include several url shorteners into geolocation-!cn category
2020-06-05 04:27:22 +08:00
KslrandGitHub 7f9502523e Merge pull request #465 from Loyalsoldier/update-epicgames
Update epicgames
2020-06-05 04:23:33 +08:00
KslrandGitHub 9bbf84cdd4 Merge pull request #463 from Loyalsoldier/update-discord
Update discord
2020-06-04 06:07:41 +08:00
KslrandGitHub 1eacf2aedc Merge pull request #462 from EpLiar/update-sf
Update sf-express
2020-06-03 16:08:52 +08:00
KslrandGitHub 2b35877fba Merge pull request #459 from EpLiar/0DD75ABB
Update alibaba and geolocation-cn.
2020-06-03 14:11:15 +08:00
KslrandGitHub 480121376a Merge pull request #458 from Loyalsoldier/update-workflow
Update workflow
2020-06-03 04:17:09 +08:00
KslrandGitHub 80c5fb715a Merge pull request #456 from Loyalsoldier/update-fox
Update fox
2020-06-03 01:16:20 +08:00
KslrandGitHub 7802a947dc Merge pull request #457 from Loyalsoldier/update-!cn
Include tiktok & attwatchtv into geolocation-!cn category
2020-06-03 01:14:57 +08:00
KslrandGitHub a3a9af1370 Merge pull request #453 from EpLiar/CFC054
Update douyu, geolocation-cn and qihoo360.
2020-06-02 02:30:41 +08:00
KslrandGitHub 004325f888 Merge pull request #444 from Loyalsoldier/update-notion
Include notion into geolocation-!cn category
2020-05-30 05:53:43 +08:00
KslrandGitHub 4c67dd843e Merge pull request #447 from Loyalsoldier/update-google
Update google
2020-05-30 05:52:30 +08:00
KslrandGitHub 1b4b40fab9 Merge pull request #448 from Loyalsoldier/update-google-ads
Sort google-ads
2020-05-30 05:51:45 +08:00
KslrandGitHub e3d71bc317 Merge pull request #449 from EpLiar/0872E0
Update 58tongcheng and geolocation-cn.
2020-05-30 05:50:56 +08:00
KslrandGitHub dd399a3d0a Merge pull request #445 from Loyalsoldier/update-golang
Update golang
2020-05-29 13:59:23 +08:00
KslrandGitHub 5b69bc1cce Merge pull request #443 from junjieyuan/add-miwifi_com
Rewrite xiaomi, add miwifi.com (The management web page and official …
2020-05-28 00:08:40 +08:00
KslrandGitHub f43207be45 Merge pull request #442 from Loyalsoldier/update-amazon
Update amazon
2020-05-27 17:08:35 +08:00
KslrandGitHub 30f4c59c97 Merge pull request #438 from Loyalsoldier/update-tiktok
Update tiktok
2020-05-26 19:13:55 +08:00
KslrandGitHub e0d87365a9 Merge pull request #439 from Loyalsoldier/add-ark
Include ark into category-vpnservices
2020-05-26 19:04:25 +08:00
KslrandGitHub 929d223d07 Merge pull request #440 from Loyalsoldier/update-bilibili
Update bilibili
2020-05-26 19:03:16 +08:00
KslrandGitHub 873191f998 Merge pull request #436 from StarryVoid/patch-2
Add Notion.com domain file "notion"
2020-05-25 18:16:26 +08:00
KslrandGitHub 9eea38fb38 Merge pull request #437 from EpLiar/add-pptv
Add pptv, update geolocation-cn
2020-05-25 18:15:09 +08:00
KslrandGitHub 561297cd7f Merge pull request #435 from rhjdvsgsgks/patch-1
Update baidu
2020-05-24 22:39:15 +08:00
KslrandGitHub 0cec4feb9f Merge pull request #434 from Loyalsoldier/update-yyets
Update yyets
2020-05-23 16:31:32 +08:00
KslrandGitHub f3d4ce6772 Merge pull request #432 from Loyalsoldier/update-!cn
Include hinet & litv into geolocation-!cn category
2020-05-22 15:50:48 +08:00
KslrandGitHub 6f65853954 Merge pull request #433 from Loyalsoldier/update-apkpure
Update apkpure
2020-05-22 15:50:25 +08:00
KslrandGitHub 04446254e9 Merge pull request #429 from Loyalsoldier/update-scholar
Include cern & nejm into category-scholar-!cn
2020-05-20 14:27:42 +08:00
KslrandGitHub 6bca380ee8 Merge pull request #428 from Loyalsoldier/update-voanews-1
Update voanews
2020-05-20 14:26:29 +08:00
KslrandGitHub 09d6ed8c47 Merge pull request #427 from Loyalsoldier/add-deno
Include deno into category-dev
2020-05-20 14:25:46 +08:00
KslrandGitHub 545e88d1c7 Merge pull request #426 from Loyalsoldier/update-zeit
Rename zeit to vercel
2020-05-20 13:57:51 +08:00
KslrandGitHub b4bb7b1fc5 Merge pull request #423 from EpLiar/add-tiancity
Add and update.
2020-05-15 17:53:49 +08:00
KslrandGitHub 1fe5be9098 Merge pull request #421 from EpLiar/add-meizu
Add meizu and xueqiu
2020-05-11 16:55:37 +08:00
KslrandGitHub c5af967728 Merge pull request #417 from Loyalsoldier/update-google
Update google
2020-05-06 20:29:37 +08:00
KslrandGitHub 2ebeba23aa Merge pull request #415 from Loyalsoldier/add-dcard
Include dcard into geolocation-!cn category
2020-05-06 17:59:16 +08:00
KslrandGitHub efd815c348 Merge pull request #413 from johnrosen1/master
add tiktok domains
2020-05-04 18:38:57 +08:00
KslrandGitHub 117536ab3c Merge pull request #414 from junjieyuan/add-zhihuishu_com
add zhihuishu.com
2020-05-04 18:37:07 +08:00
KslrandGitHub 70d1a2fc3c Merge pull request #408 from studentmain/master
add e-hentai domains
2020-05-03 02:03:06 +08:00
KslrandGitHub 2ddfb28a45 Merge pull request #381 from Loyalsoldier/update-cnn
Update cnn
2020-04-29 18:56:38 +08:00
KslrandGitHub acd429814f Merge pull request #398 from Loyalsoldier/update-steam
Update steam
2020-04-29 18:56:06 +08:00
KslrandGitHub 5df6c2e927 Merge pull request #393 from Loyalsoldier/update-nytimes
Update nytimes
2020-04-29 18:55:14 +08:00
KslrandGitHub b1ebfbc758 Merge pull request #388 from Loyalsoldier/update-hp
Update hp
2020-04-29 18:28:13 +08:00
KslrandGitHub 440aef863b Merge pull request #396 from Loyalsoldier/update-samsung
Update samsung
2020-04-29 01:09:08 +08:00
KslrandGitHub 5d2dcaa77a Merge pull request #384 from Loyalsoldier/update-elsevier
Update elsevier
2020-04-29 01:08:23 +08:00
KslrandGitHub 692828e514 Merge pull request #397 from Loyalsoldier/update-stackexchange
Update stackexchange
2020-04-29 01:07:26 +08:00
KslrandGitHub 461dcaab1a Merge pull request #399 from Loyalsoldier/update-uber
Update uber
2020-04-29 01:05:57 +08:00
KslrandGitHub c8053d4e08 Merge pull request #375 from LiJingqing/master
Add hkedity and twitch
2020-04-27 15:10:50 +08:00
KslrandGitHub 9b9b51a52d Merge pull request #376 from EpLiar/update-geolocation-cn
Update geolocation-cn and tencent
2020-04-27 15:09:04 +08:00
KslrandGitHub 65f3d19382 Merge pull request #337 from rhjdvsgsgks/patch-1
add some ad domains
2020-04-24 20:35:26 +08:00
KslrandGitHub 1de40a2901 Merge branch 'master' into patch-1 2020-04-24 20:35:13 +08:00
KslrandGitHub 8da13c8ef3 Merge pull request #368 from Loyalsoldier/update-adobe
Update adobe
2020-04-23 04:51:14 +08:00
KslrandGitHub 357b9afa2b Merge pull request #359 from Loyalsoldier/update-digicert
Update digicert
2020-04-21 14:37:56 +08:00
KslrandGitHub d70245d6e5 Merge pull request #355 from Loyalsoldier/update-v2ray
Update v2ray
2020-04-21 14:35:28 +08:00
KslrandGitHub f4378daf0c Merge pull request #358 from Loyalsoldier/update-google
Update google
2020-04-21 14:30:31 +08:00
KslrandGitHub dbcab4fb62 Merge pull request #343 from EpLiar/add-ruanmei
Add ruanmei, update geolocation-cn
2020-04-18 11:55:08 +08:00
KslrandGitHub 6c33bb8d0c Merge pull request #345 from Loyalsoldier/update-rarbg
Update rarbg
2020-04-18 11:52:00 +08:00
KslrandGitHub 938d8dd581 Merge pull request #327 from Loyalsoldier/master
Update amazon
2020-04-10 20:00:38 +08:00
KslrandGitHub a6c018dbc6 Merge pull request #326 from Loyalsoldier/update-docker
Update docker
2020-04-10 17:10:56 +08:00
KslrandGitHub 4c94a4116a Merge pull request #325 from Loyalsoldier/update-npmjs
Update npmjs
2020-04-10 17:10:02 +08:00
KslrandGitHub 9283cd00e6 Merge pull request #308 from Loyalsoldier/update-google
Remove golang.org from google sub-list
2020-04-07 19:15:14 +08:00
KslrandGitHub ce57b03f86 Merge pull request #289 from EpLiar/add-zsxq
Add zsxq in geolocation-cn, renamed sf to sf-express
2020-04-06 12:10:17 +08:00
KslrandGitHub e32765570f Merge pull request #286 from Loyalsoldier/remove-speedtest
Remove speedtest due to #285. Fixes #285
2020-04-06 00:41:17 +08:00
KslrandGitHub c0cd36728a Merge pull request #279 from junjieyuan/add-tipdm-cup
add TipDM Cup
2020-04-01 17:28:17 +08:00
KslrandGitHub 514cf64cf2 Merge pull request #269 from Loyalsoldier/update-dropbox
Update dropbox
2020-03-22 22:08:08 +08:00
KslrandGitHub 25da5081b1 Merge pull request #238 from ToutyRater/patch-2
Add more ads domains
2020-03-03 01:43:42 +08:00
KslrandGitHub d6358ad86e Merge pull request #235 from Loyalsoldier/patch-1
Update github sub-list
2020-02-28 01:06:42 +08:00
KslrandGitHub 8409757955 Merge pull request #220 from mzz2017/patch-2
Update alibaba
2020-02-25 19:47:19 +08:00
KslrandGitHub c2bc202221 Merge pull request #214 from rhjdvsgsgks/patch-1
Patch 1
2020-02-25 01:14:07 +08:00