Commit Graph

930 Commits

Author SHA1 Message Date
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
gfyoung
d1ecc7bdd6 Add OSX to Travis matrix 2017-06-28 21:18:50 -07:00
Steven Black
fdc9b6a92d Merge pull request #345 from gfyoung/update-unit-tests
Add unittests for updateHostsFile.py
2017-06-28 23:37:07 -04:00
gfyoung
dce24af399 Add unittests for updateHostsFile.py 2017-06-28 20:13:01 -07:00
Steven Black
bc0d5e3e38 New data from SpotifyAds, someonewhocares.org, KADhosts, and Badd-Boyz. 2017-06-28 18:18:07 -04:00
Steven Black
9c34dc9c19 New data from yoyo.org, mvps.org, and Badd-Boyz. Laicure remoed. 2017-06-24 07:52:41 -04:00
Steven Black
74a162d1cf Merge pull request #343 from Laicure/master
Withdrawing my list
2017-06-24 07:48:19 -04:00
Laicurè Leviarè
c75ecc7db4 Delete update.json 2017-06-24 07:04:22 +08:00
Laicurè Leviarè
539c3ad29e Delete hosts 2017-06-24 07:04:11 +08:00
Steven Black
1d96ed88be New data from Laicure and Badd-Boyz 2017-06-22 11:46:39 -04:00
Indrajit Raychaudhuri
fd046bc460 Honor whitelist exclusion only for domain or subdomain match
* Whitelisting `s.youtube.com` should not whitelist `ads.youtube.com`; but
  can whitelist `a.s.youtube.com`
* Whitelisting `twitter.com` should not whitelist `ttwitter.com` or
  `twitter.com.au`; but can whitelist `a.twitter.com`
2017-06-22 01:43:56 -05:00
Steven Black
a892529a1b New data from yoyo.org, someonewhocares.org, Laicure, KADhosts, and Badd-Boyz. 2017-06-21 11:03:29 -04:00
Steven Black
2ad1144594 Merge pull request #338 from indrajitr/hostmatch-fix
Tighten regex rule to discard IP address as hostname
2017-06-21 10:33:59 -04:00
Indrajit Raychaudhuri
7e1b06ecf9 Tighten regex rule to discard IP address as hostname 2017-06-20 02:06:31 -05:00
Steven Black
297c699103 New data from FakeNews, yoyo.org, someonewhocares.org, laicure, and Badd-Boyz. 2017-06-11 11:45:31 -04:00
Steven Black
3d21c6343c New data from Sinfonetia, someonewhocares.org, KADhosts, and Badd-Boyz. 2017-06-05 23:58:25 -04:00
Steven Black
82c0aadca0 New data from sinfonetia, clefspeare13, yoyo.org, someonewhocares.org, malwaredomainlist.com, laicure, KADhosts, and Badd-Boyz. 2017-06-02 10:30:29 -04:00
Steven Black
365de116c8 New data from Badd-Boyz 2017-05-30 10:32:00 -04:00
Steven Black
71f452c0c5 New data from FakeNews, and Badd-Boyz. 2017-05-29 23:02:32 -04:00
Steven Black
96ac61c119 Merge pull request #325 from gfyoung/terminal-color-support
Check if terminal supports color
2017-05-29 23:00:35 -04:00
Steven Black
a984263379 Merge pull request #324 from gfyoung/dns-cache-linux-refactor
Refactor DNS cache flushing for Linux
2017-05-29 22:59:58 -04:00
gfyoung
2d6a8676a4 Check if terminal supports color
Closes gh-151.
2017-05-28 12:40:32 -04:00
gfyoung
3b581ce782 Refactor DNS cache flushing for Linux 2017-05-28 12:40:25 -04:00
Steven Black
b7569a0abd New data from yoyo.org, someonewhocares.org, Laicure, KADhosts, and Badd-Boyz. 2017-05-28 10:43:49 -04:00
Steven Black
13af5aa97d Merge pull request #308 from gfyoung/python-script-doc
Document all functions in Python scripts
2017-05-24 08:50:11 -04:00
gfyoung
51a0ec21bd Document all functions in Python scripts 2017-05-23 21:58:22 -04:00
Steven Black
674c903ada New data from yoyo.org, someonewhocares.org, Laicure, and Badd-Boyz 2017-05-23 10:11:04 -04:00
Steven Black
67dea02b9c Merge pull request #317 from gfyoung/make-hosts-python
Create makeHosts file in Python
2017-05-23 10:08:00 -04:00
Steven Black
526a457a38 Merge pull request #322 from gfyoung/kde-neon-dns-cache
Check /usr/lib and /lib for systemd
2017-05-23 10:03:22 -04:00
Steven Black
b064f9c092 Merge pull request #323 from gfyoung/unicode-str-join
Concatenate str only in os.path.join
2017-05-23 00:16:03 -04:00
gfyoung
2aecbf9707 Concatenate str only in os.path.join
Closes gh-316.
2017-05-22 23:31:35 -04:00
gfyoung
8806131c74 Check /usr/lib and /lib for systemd
Closes gh-321.
2017-05-22 21:19:31 -04:00
gfyoung
90afb0c623 Create makeHosts file in Python
Closes gh-316.
2017-05-21 22:30:36 -04:00
Steven Black
30cbb9a1ec Merge pull request #319 from gfyoung/path-join-robust
Wrap os.path.join to handle LOCALE issues (take 2)
2017-05-21 22:26:02 -04:00
gfyoung
8f3e71e327 Wrap os.path.join to handle LOCALE issues
Closes gh-81.
Closes gh-318.
2017-05-21 21:51:13 -04:00
Steven Black
a593138734 New data by Clefspeare, yoyo.org, someewhocares.org, Laicure, KADhosts, and Badd-Boyz. 2017-05-21 21:39:18 -04:00
Steven Black
d343798ed1 Ref: Issue #312 undo commit 2ff5dc2
cc @gfyoung

Commit 2ff5dc2 is generating errors on macOS.

See Issue #318.
2017-05-21 21:34:54 -04:00