Commit Graph
100 Commits
Author SHA1 Message Date
KslrandGitHub b19d50cdb7 Merge pull request #134 from TheWanderingCoel/create-flatpak
Create flatpak
2020-08-10 21:22:45 +08:00
KslrandGitHub 98d615815c Merge pull request #77 from Loyalsoldier/fix-inclusion-name
Fix: inclusion file name not capitalized
2020-07-27 19:22:22 +08:00
KslrandGitHub ec973741d6 Merge pull request #49 from Loyalsoldier/revert-update-go-version
Revert "update go version"
2020-07-24 02:40:40 +08:00
KslrandGitHub 854ff30839 Merge pull request #48 from EpLiar/update-hp
Update hp
2020-07-23 14:23:10 +08:00
KslrandGitHub d3c087814e update go version 2020-07-23 14:19:49 +08:00
KslrandGitHub 4f9e9bbe66 Merge pull request #642 from EpLiar/create-dogecoin
Create dogecoin
2020-07-18 17:55:23 +08:00
KslrandGitHub f82c03ec8a Merge pull request #643 from EpLiar/create-nist
Create nist
2020-07-18 17:55:00 +08:00
KslrandGitHub c5e5c870d7 Merge pull request #644 from EpLiar/update-netease-ads
Update netease-ads
2020-07-18 17:47:45 +08:00
KslrandGitHub 9eeb2c4516 Merge pull request #646 from Robot-DaneelOlivaw/update-amazon
Update amazon
2020-07-18 17:46:34 +08:00
KslrandGitHub e0a5faab9f Merge pull request #647 from EpLiar/update-apple
Update apple
2020-07-18 17:36:38 +08:00
KslrandGitHub 67a119c5a4 Merge pull request #624 from Loyalsoldier/update-tld-!cn
Update tld-!cn
2020-07-16 22:44:32 +08:00
KslrandGitHub c6ffe7c351 Merge pull request #625 from Loyalsoldier/add-abema
Include abema into geolocation-!cn category
2020-07-16 22:43:41 +08:00
KslrandGitHub eeafcc8482 Merge pull request #626 from Loyalsoldier/add-cybertrust
Include cybertrust into geolocation-!cn category
2020-07-16 22:43:22 +08:00
KslrandGitHub 1a50b317cf Merge pull request #627 from Loyalsoldier/add-cryptocurrency
Add dozens of cryptocurrency related domains
2020-07-16 22:41:27 +08:00
KslrandGitHub 933f086df5 Merge pull request #620 from Loyalsoldier/update-amazon
Update amazon
2020-07-16 00:57:37 +08:00
KslrandGitHub 9776bab7dc Merge pull request #606 from EpLiar/create-tld-!cn
Create tld-!cn
2020-07-16 00:56:05 +08:00
KslrandGitHub 1ab4638cdb Merge pull request #619 from Loyalsoldier/update-apple
Update apple
2020-07-16 00:49:43 +08:00
KslrandGitHub 0f82809c47 Merge pull request #618 from Loyalsoldier/update-google
Remove .cn domains from google sub-list
2020-07-16 00:46:36 +08:00
KslrandGitHub 58c00ab8b9 Merge pull request #617 from Loyalsoldier/update-microsoft
Update microsoft
2020-07-16 00:45:50 +08:00
KslrandGitHub c2f38b4666 Merge pull request #615 from EpLiar/create-gigabyte
Create gigabyte
2020-07-15 18:09:20 +08:00
KslrandGitHub f23d5a66ab Merge pull request #614 from EpLiar/create-westerndigital
Create westerndigital
2020-07-15 16:56:52 +08:00
KslrandGitHub b1a3be646c Merge pull request #613 from EpLiar/create-acer
Create acer
2020-07-15 16:26:00 +08:00
KslrandGitHub 3f0fb54ff7 Merge pull request #611 from EpLiar/create-1pondo
Create 1pondo
2020-07-15 16:25:44 +08:00
KslrandGitHub 65e3d15df1 Merge pull request #612 from EpLiar/create-heyzo
Create heyzo
2020-07-15 16:23:12 +08:00
KslrandGitHub c4a9bba8bc Merge pull request #608 from Loyalsoldier/update-aljazeera
Update aljazeera
2020-07-14 19:09:57 +08:00
KslrandGitHub ad462d7094 Merge pull request #607 from EpLiar/update-microsoft
Update microsoft
2020-07-14 16:42:38 +08:00
KslrandGitHub 103ac99d2f Merge pull request #602 from EpLiar/create-adidas
Create adidas
2020-07-13 17:42:17 +08:00
KslrandGitHub a3ec3df3a8 Merge pull request #598 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-13 17:41:53 +08:00
KslrandGitHub 287bba6eb2 Merge pull request #599 from EpLiar/update-spotify
Update spotify
2020-07-13 17:38:16 +08:00
KslrandGitHub c0ff2a815a Merge pull request #600 from EpLiar/update-hulu
Update hulu
2020-07-13 17:36:51 +08:00
KslrandGitHub 4e91d92df2 Merge pull request #601 from EpLiar/create-bmw
Create bmw
2020-07-13 17:35:21 +08:00
KslrandGitHub f8077c6e29 Merge pull request #597 from Loyalsoldier/add-elearning
Include several e-learning domains into geolocation-!cn category
2020-07-12 16:08:50 +08:00
KslrandGitHub 6b321ff484 Merge pull request #592 from EpLiar/create-ximalaya
Create ximalaya
2020-07-12 03:56:46 +08:00
KslrandGitHub acfaa40301 Merge pull request #593 from EpLiar/create-yuanfudao
Create yuanfudao
2020-07-12 03:56:26 +08:00
KslrandGitHub bfd8cd76f3 Merge pull request #591 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-11 18:20:57 +08:00
KslrandGitHub e77ff84e80 Merge pull request #590 from EpLiar/create-gucci
Create gucci
2020-07-11 18:20:40 +08:00
KslrandGitHub a2b9b9e733 Merge pull request #589 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-11 14:30:54 +08:00
KslrandGitHub 6d653ae458 Merge pull request #576 from EpLiar/create-ziroom
Create ziroom
2020-07-10 18:01:56 +08:00
KslrandGitHub c18dbca72c Merge pull request #575 from Loyalsoldier/patch-1
Update sourceforge
2020-07-10 18:00:55 +08:00
KslrandGitHub 17074a47e7 Merge pull request #577 from YibaiMeng/patch-1
Update duckduckgo
2020-07-10 18:00:21 +08:00
KslrandGitHub 01caa21757 Merge pull request #578 from EpLiar/update-baidu
Update baidu
2020-07-10 17:53:40 +08:00
KslrandGitHub 5d31098fec Merge pull request #579 from EpLiar/update-nike
Add .nike domain
2020-07-10 17:52:26 +08:00
KslrandGitHub 4427255ac3 Merge pull request #581 from EpLiar/update-alibaba
Update alibaba
2020-07-10 17:50:06 +08:00
KslrandGitHub 5e058df97f Merge pull request #582 from EpLiar/create-mcdonalds
Create mcdonalds
2020-07-10 17:48:55 +08:00
KslrandGitHub 2ce5012cb6 Merge pull request #583 from EpLiar/update-google
Add some tld belongs to Google
2020-07-10 17:46:04 +08:00
KslrandGitHub 28d3abccfd Merge pull request #584 from EpLiar/update-amazon
Update amazon
2020-07-10 17:45:25 +08:00
KslrandGitHub ed7e7700e5 Merge pull request #580 from EpLiar/create-icbc
Create icbc
2020-07-10 17:24:47 +08:00
KslrandGitHub 1e048aaf2e Merge pull request #568 from EpLiar/create-everbright
Create everbright
2020-07-09 17:11:18 +08:00
KslrandGitHub ddb184c8a2 Merge pull request #562 from LamJH/update-steam
Update Steam and geolocation-cn
2020-07-08 18:38:40 +08:00
KslrandGitHub 21453adee4 Merge pull request #555 from EpLiar/update-geolocation-cn
Update geolocation-cn
2020-07-07 20:29:46 +08:00
KslrandGitHub a958ab1c47 Merge pull request #541 from EpLiar/update-yandex
Update yandex
2020-07-06 00:45:51 +08:00
KslrandGitHub 4b678d6412 Merge pull request #538 from EpLiar/update-apple
Update apple
2020-07-05 17:16:12 +08:00
KslrandGitHub ad87d55073 Merge pull request #539 from EpLiar/update-icloud
Update icloud
2020-07-05 17:15:52 +08:00
KslrandGitHub 2dfb86b27a Merge pull request #540 from EpLiar/update-itunes
Update itunes
2020-07-05 17:15:35 +08:00
KslrandGitHub e984983fef Merge pull request #521 from tritu/master
Update sling
2020-07-05 15:44:07 +08:00
KslrandGitHub d70885dbc6 Merge pull request #533 from EpLiar/update-ebay
Update ebay
2020-07-05 15:42:03 +08:00
KslrandGitHub 7e3937ca35 Merge pull request #534 from EpLiar/update-redis
Update redis
2020-07-05 15:41:36 +08:00
KslrandGitHub b0d18b0521 Merge pull request #535 from EpLiar/update-ynet
Update ynet
2020-07-05 15:41:21 +08:00
KslrandGitHub fa26186bf6 Merge pull request #536 from EpLiar/update-samsung
Update samsung
2020-07-05 15:40:59 +08:00
KslrandGitHub 4df7028238 Merge pull request #537 from EpLiar/update-microsoft
Update microsoft
2020-07-05 15:40:05 +08:00
KslrandGitHub 0b0c8ef0b7 Merge pull request #532 from EpLiar/update-nike
Update nike
2020-07-04 13:55:13 +08:00
KslrandGitHub 7f6dbb126c Merge pull request #531 from EpLiar/create-cloudcone
Create cloudcone
2020-07-04 12:07:14 +08:00
KslrandGitHub faffca37b6 Merge pull request #529 from EpLiar/create-visa
Create visa
2020-07-04 11:11:11 +08:00
KslrandGitHub ff71022c7d Merge pull request #526 from EpLiar/update-apple
Update apple
2020-07-03 17:01:38 +08:00
KslrandGitHub c90996d9dc Merge pull request #527 from EpLiar/update-wordpress
Update wordpress
2020-07-03 17:01:11 +08:00
KslrandGitHub 8e63ef743e Merge pull request #528 from EpLiar/update-facebook
Update facebook
2020-07-03 17:00:49 +08:00
KslrandGitHub a2198bd911 Merge pull request #525 from Loyalsoldier/add-epoch
Include epochmediagroup into category-media
2020-07-02 16:13:29 +08:00
KslrandGitHub 80c1b562fe Merge pull request #524 from Loyalsoldier/update-cloudflare
Update cloudflare
2020-07-02 07:31:57 +08:00
KslrandGitHub c43f6ce336 Merge pull request #523 from Loyalsoldier/update-cn
Add gushiwen.org into geolocation-cn category
2020-07-02 00:04:28 +08:00
KslrandGitHub a8014065eb Merge pull request #522 from Loyalsoldier/add-hashicorp
Include hashicorp into category-dev
2020-07-02 00:02:47 +08:00
KslrandGitHub 4035c6d1f2 Merge pull request #519 from EpLiar/update-apple
Sort and update
2020-06-29 16:05:36 +08:00
KslrandGitHub 795bcaf289 Merge pull request #517 from Loyalsoldier/update-docker
Update docker
2020-06-28 16:03:27 +08:00
KslrandGitHub 3d61ac4a88 Merge pull request #516 from Loyalsoldier/update-!cn
Include sling into geolocation-!cn category
2020-06-27 02:03:44 +08:00
KslrandGitHub fd10b6f9e8 Merge pull request #515 from Loyalsoldier/add-podcast
Include megaphone into geolocation-!cn category
2020-06-27 00:56:35 +08:00
KslrandGitHub 792b8567e3 Merge pull request #513 from Loyalsoldier/add-sony
Include sony & sonypictures into geolocation-!cn category
2020-06-23 22:27:43 +08:00
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