Commit Graph
966 Commits
Author SHA1 Message Date
Steven Black 8fb2dfa6de Fix typo. 2017-08-20 12:08:28 -04:00
Steven Black 3edb53c7d9 Remove references to .zip files in the tests. 2017-08-20 12:00:38 -04:00
Steven Black 68dcf5c125 Remove references to .zip files in the generator programs. 2017-08-20 12:00:19 -04:00
Steven Black 59c595ebcb Remove references to .zip files in docs. 2017-08-20 11:59:30 -04:00
Steven Black 2460908edf Remove all .zip files from the repo. 2017-08-20 11:47:46 -04:00
Steven Black 12ba2be538 New data from Badd-Boyz. 2017-08-18 11:14:37 -04:00
Steven Black e183d76381 New data from yoyo.org, someonewhocares.org, and Badd-Boyz. 2017-08-18 09:26:18 -04:00
Steven Black c43ddacee4 Merge pull request #387 from ScriptTiger/master
Corrected typo
2017-08-16 12:08:30 -04:00
ScriptTiger 684a125287 Corrected typo
Changed "acitive" to "active".
2017-08-16 15:13:30 +08:00
Steven Black 88245e2403 Merge pull request #386 from ScriptTiger/master
Updated README with ScriptTiger Projects
2017-08-15 21:50:36 -04:00
ScriptTiger 6047247711 Updated README with ScriptTiger Projects
Updated the README template with information on the related ScriptTiger projects.

https://github.com/StevenBlack/hosts/issues/272
2017-08-16 09:18:41 +08:00
Steven Black d4f3adcfe2 New Data from Badd-Boyz. 2017-08-15 11:26:37 -04:00
Steven Black 32495c334d New data from yoyo.org, someonewhocares.org, KADhosts, Badd-Boyz, and add.Risk. 2017-08-15 10:56:56 -04:00
Steven Black 7ad3417ad4 It's 2017. 2017-08-15 01:31:04 -04:00
Steven Black d1cccf7ace Merge pull request #379 from gfyoung/settings-refactor
Refactor out global settings usage in update logic
2017-08-12 13:34:59 -04:00
Steven Black ef8d36c8a9 New data from yoyo.org, and Badd-Boyz. 2017-08-12 11:15:47 -04:00
gfyoung f83a56d317 Refactor out global settings usage in update logic 2017-08-09 08:13:22 -07:00
Steven Black 18e89f121e New data from yoyo.org, someonewhocares.org, mvps.org, and KADhosts. 2017-08-08 11:36:11 -04:00
Steven Black b7c65a10dc Merge pull request #366 from gfyoung/settings-refactor
Refactor out global settings usage in exclusions
2017-08-07 12:26:54 -04:00
gfyoung 942069db81 Refactor out global settings usage in exclusions 2017-08-07 08:43:47 -07:00
Steven Black c00c233aab Merge pull request #373 from gfyoung/python-3.5-add
Add Python 3.5 testing to Travis
2017-08-05 21:59:08 -04:00
gfyoung 50dd78f74d Add Python 3.5 testing to Travis 2017-08-02 20:57:11 -07:00
Steven Black 5fe0dedf31 New data from sinfonietta, someonewhocares.org, and KADhosts. 2017-07-31 21:00:25 -04:00
Steven Black 66ad24ca60 New data from yoyo.org, someonewhocares.org, and Badd-Boyz. 2017-07-28 20:33:13 -04:00
Steven Black 7486a074f6 Merge pull request #369 from ScriptTiger/master
Added "androidads23.adcolony.com" to data\StevenBlack\hosts
2017-07-28 11:32:08 -04:00
ScriptTiger abd38b8d59 Added "androidads23.adcolony.com" to data\StevenBlack\hosts
Picked up "androidads23.adcolony.com" being called from Smule. Another AdColony node, "ads20.adcolony.com", is already added to one of the other lists. Apparently there are actually several of them, but I have only personally caught this one.
2017-07-28 23:25:50 +08:00
Steven Black 9498881bcc New data from eight different sources. 2017-07-26 01:21:48 -04:00
Steven Black 3cab5a2f88 Update readme_template – phrasing. 2017-07-26 01:18:44 -04:00
Steven Black a2b1b57c3b New data from Badd-Boyz. 2017-07-18 12:51:34 -04:00
Steven Black f3b2afa8c5 New data from add.risks. 2017-07-17 21:48:40 -04:00
Steven Black f7f8f5d482 New data from Synfonettia, yoyo.org, someonewhocares.org, KADhosts, and Badd-Boyz. 2017-07-17 14:06:38 -04:00
Steven Black 331417b07d Merge pull request #356 from gfyoung/settings-refactor
Refactor out global settings usage in user prompt
2017-07-13 14:27:21 -04:00
gfyoung 4b96f3f34a Refactor out global settings usage in user prompt 2017-07-13 08:20:03 -07:00
Steven Black a819131927 New data from yoyo.org, and Badd-Boyz. 2017-07-12 09:48:14 -04:00
Steven Black 02c0ba92fc New data from Badd-Boyz, and Sinfonettia. 2017-07-11 12:53:48 -04:00
Steven Black bf56886abf New data from yoyo.org, and Badd-Boyz. 2017-07-11 10:17:11 -04:00
Steven Black 0cbf5b618e Merge pull request #357 from gfyoung/test-script-rename
Rename Travis CI scripts
2017-07-11 10:07:24 -04:00
gfyoung 97963aea4f Rename Travis CI scripts 2017-07-10 20:27:48 -07:00
Steven Black 178f16374c New data from clefspeare13, Sinfionietta, yoyo.org, someonewhocares.org, KADhosts, and Badd-Boyz. 2017-07-10 21:14:39 -04:00
Steven Black 7ab30dec1e Merge pull request #355 from gfyoung/drop-nose-depend
Drop nose dependency on Travis
2017-07-10 17:38:53 -04:00
gfyoung 65eb217353 Drop nose dependency on Travis
Nose is not a well-supported library anymore.
Let's just use Python's builtin unittest library.
2017-07-09 20:26:12 -07:00
Steven Black d945d7bcc0 Merge pull request #341 from indrajitr/hostmatch-fix
Honor whitelist exclusion only for domain or subdomain match
2017-07-09 13:13:57 -04:00
Steven Black 20c0441069 Merge pull request #353 from indrajitr/normalized-host-test
Add more tests for normalized host filter

Thank you again, Indrajit @indrajitr !
2017-07-09 13:08:40 -04:00
Steven Black fb74f4ea38 Merge pull request #354 from meinhimmel/master
Fix the number of unique entries.

Thank you @meinhimmel !

Merging.
2017-07-09 13:06:54 -04:00
Dylan Armstrong 02a28cd05b Fix the number of unique entries. 2017-07-08 20:20:03 -05:00
Indrajit Raychaudhuri e8aeadb6b3 Add more tests for normalized host filter 2017-07-08 19:52:30 -05:00
Steven Black e213544f84 New data from yoyo.org, someonewhocares.org, malwaredomainlist.com, and KADhosts. 2017-07-04 13:27:40 -04:00
Steven Black 8759525e04 Merge pull request #348 from gfyoung/settings-refactor
Reduce dependency on global settings variable
2017-07-03 22:54:45 -04:00
gfyoung 415b89a022 Reduce dependency on global settings variable
Global variables make code less modular
and therefore more difficult to test.
2017-07-03 18:42:15 -07:00
Steven Black 0b5e8db26d Merge pull request #347 from gfyoung/osx-travis-add
Add OSX to Travis matrix
2017-06-29 10:49:36 -04:00