starred/hosts
1
0
Fork 0
mirror of https://github.com/StevenBlack/hosts.git synced 2026-09-30 22:06:38 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity
2,168 Commits 2 Branches 890 Tags
7a82c707cd0ad80f4eec87fe9b6d3b0fbbfdd5df
Commit Graph
2168 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Steven Black 7a82c707cd Updates from clefspeare13, yoyo.org, URLHaus, mvps.org, KADhosts, hostsVN, Badd-Boyz, and AdAway.org. 2020-05-05 01:36:49 -04:00
Steven Black 2b27276629 Add domains from issue #1261. 2020-05-04 13:50:50 -04:00
Steven Black b2f128872c Add domain from Issue #1253. 2020-05-03 12:51:29 -04:00
Steven Black 0d1a3e00e7 Merge pull request #1259 from XhmikosR/patch-1 
Make sure we treat any readme assets as `utf-8`
 2020-05-03 12:46:47 -04:00
XhmikosR 6709f769e4 Make sure we treat any readme assets as utf-8 2020-05-03 08:57:45 +03:00
Steven Black 454b3c2afa Release 2.6.10 2.6.10 2020-05-02 19:10:21 -04:00
Steven Black a32b5d82bf Updates from clefspeare13, yoyo.org, URLHaus, KADhosts, hostsVN, and Badd-Boyz. 2020-05-02 19:10:00 -04:00
Steven Black f3fbfd2079 Add domain in Issue #1244. 2020-05-02 19:05:45 -04:00
Steven Black e7721d35a8 Add domains in Issue #1245. 2020-05-02 19:04:43 -04:00
Steven Black 652992750e Add domains from Issue #1247. 2020-05-02 19:03:18 -04:00
Steven Black 6e0dbd6447 Add domains from Issue #1254. 2020-05-02 19:01:45 -04:00
Steven Black 0cc3163dda Add domain from Issue #1257. 2020-05-02 18:56:51 -04:00
Steven Black 47f9a28b81 Merge pull request #1258 from XhmikosR/patch-1 
Fix domain from #1202
 2020-05-02 15:13:36 -04:00
XhmikosR 3ab6d9d5e8 Fix domain from #1202 2020-05-02 22:10:21 +03:00
Steven Black d002c5783e One more domain from Issue #1252. 2020-04-30 10:35:19 -04:00
Steven Black 6c4268bdc7 Add domains from Issue ##1251. 2020-04-30 10:31:51 -04:00
Steven Black 79f628a09f Add domains from Issue #1252. 2020-04-30 10:28:46 -04:00
Steven Black 0d35158c6c Merge pull request #1250 from XhmikosR/gh-actions 
Switch to GitHub Actions CI.
 2020-04-30 09:59:01 -04:00
XhmikosR ec5723b926 ci/test.sh: add python --version 2020-04-29 15:31:55 +03:00
XhmikosR bdcb4954e9 CI: move lint before test and add Python 3.8 2020-04-29 15:31:55 +03:00
XhmikosR 125d7c8745 Switch to GitHub Actions CI. 2020-04-29 15:31:54 +03:00
Steven Black 5d8275411c Release 2.6.9 2.6.9 2020-04-28 14:41:25 -04:00
Steven Black 96a84da45f Updates from yoyo.org, URLHaus, KADhosts, and AdAway. 2020-04-28 14:41:06 -04:00
Steven Black 5a0a1b53b3 Merge pull request #1248 from PF4Public/master 
Absent from other blocklists
 2020-04-27 12:11:53 -04:00
PF4Public 4923194ff4 Absent from other blocklists 2020-04-27 15:46:50 +03:00
Steven Black cd50dbb0d0 Release 2.6.8 2.6.8 2020-04-26 22:52:03 -04:00
Steven Black a3d8d83913 Updates from clefspeare13, yoyo.org, URLHaus, someonewhocares.org, KADhosts, Badd-Boyz, and add.risk. 2020-04-26 22:51:44 -04:00
Steven Black 68c9d2f6b1 Merge pull request #1246 from gprestes/gprestes-patch-1 
Restore filename to follow the hosts-%Y-%m-%d-%H-%M-%S format
 2020-04-24 22:31:18 -04:00
Guilherme Heuser Prestes d7f8d5ef35 Add back the '-' after hosts in the filename 2020-04-24 21:16:07 +02:00
Guilherme Heuser Prestes b40aa38ee6 remove the '-' from mock 2020-04-24 21:13:41 +02:00
Steven Black ef6cff0702 Merge pull request #1236 from adherzog/fix-default-whitelist 
Fix default whitelist argument.
 2020-04-23 21:38:58 -04:00
Steven Black e7c0ef495e Merge pull request #1243 from XhmikosR/typo 
Join a few short lines and fixes a few typos
 2020-04-23 21:37:39 -04:00
XhmikosR f5358fd0b4 Join a few short lines and fixes a few typos 2020-04-23 09:02:38 +03:00
Steven Black e2ce21ba3e Issue #1239: add maper.info. 2020-04-22 18:58:15 -04:00
Steven Black 68419f063d Issue #1240: adding domains listed in this issue, 2020-04-22 18:56:05 -04:00
Steven Black 8d00a38425 Release 2.6.7 2.6.7 2020-04-22 10:29:23 -04:00
Steven Black 15e433e5c3 Updates from clefspeare13, yoyo.org, URLHaus, KADhosts, hostsVN, Badd-Boyz, and AdAway. 2020-04-22 10:28:54 -04:00
Steven Black 564141c3a5 Merge pull request #1238 from ScriptTiger/correct-sorting 
Unification of the sorting of the sources.
 2020-04-22 01:47:36 -04:00
funilrys dd7904dcc8 Add forgotten sorting. 
Indeed, I forgot to sort the content of the hosts file.
 2020-04-21 23:54:01 +02:00
funilrys 665dc98191 Unification of the sorting of the sources. 
Before this patch, there was no proper sorting and the sources.

As @XhmikosR mentioned in StevenBlack/hosts#1166, without this patch,
the output is totally different in Windows. But let's be honest, if it
is like that under Windows, chances are that the same behavior happens
across different OSes or machines around the globe.

Another reason behind this patch is that - desperate the fact that we
certainly trust @StevenBlack - the integrity of the generated files
could not be guarenteed because of the sorting which may be completely
different from an OS to another and a machine to another.

For those reasons, this patch introduces a unification of the sorting of
all sources.

The idea behind this patch is to have @StevenBlack's ad-hoc hosts
file always on top (1st) and the rest of the sources sorted
alphabetically based on the name of the folder inside the `data`
or `extensions` directory.

This will ensure that we get the same result everywhere.

Concretely speaking, I just added the function (`sort_sources`) which
sorts a given list of sources files. And later on, call the new function
everywhere it was necessary. Tests of the newly introduced function
are also included.

Contributors:
  * @ScriptTiger
  * @XhmikosR

Notes:
  * This patch fix (completely ?) ScriptTiger/hosts#1
  * This patch fix https://github.com/StevenBlack/hosts/issues/1166#issuecomment-590511086
 2020-04-21 22:54:25 +02:00
Steven Black 6548b1af25 Add domains from Issue #1237. 2020-04-20 23:43:38 -04:00
Steven Black 0c9ec0732d Add domains from Issue #1226. 2020-04-20 23:40:22 -04:00
Steven Black 546a6587cb Merge pull request #1230 from XhmikosR/patch-1 
Update KADhosts homeurl
 2020-04-20 14:39:49 -04:00
Steven Black 2e9fb614d5 Merge pull request #1231 from XhmikosR/patch-2 
Fix FadeMind's lists license
 2020-04-20 14:13:41 -04:00
Adam Herzog 2a742e7f99 Fix default whitelist argument. 2020-04-20 10:22:13 -04:00
XhmikosR cd426b4d8e Update KADhosts homeurl 2020-04-20 09:27:42 +03:00
XhmikosR 7b00af4d07 Fix FadeMind's lists license 2020-04-20 09:27:23 +03:00
Steven Black 5b25845933 Release 2.6.6 2.6.6 2020-04-18 22:39:31 -04:00
Steven Black ee37f38580 Fix error I introduced in commit daf16c7eba. 2020-04-18 22:39:13 -04:00
Steven Black 7cb8c82481 Release 2.6.5 2.6.5 2020-04-18 20:41:20 -04:00