3315 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
DL6ER	af17355fe7	Merge pull request #1302 from pi-hole/fix/nowildcardlistfile ... Check for existence of wildcard blocking list (query adlists)	2017-03-06 17:03:34 +01:00
DL6ER	dce3e50a00	Check for existence of wildcard blocking list before trying to acces it	2017-03-06 16:44:56 +01:00
DL6ER	cf31561267	Remove wildcard entry when adding the very same domain either the white- or blacklist	2017-03-06 16:25:35 +01:00
DL6ER	a97f0b1298	Merge pull request #1300 from pi-hole/fix/deletehostrecord ... Bugfix for when deleting host-record	2017-03-06 16:16:42 +01:00
Dan Schaper	d1e0f3ae18	Merge pull request #1294 from pi-hole/tweak/debugDNS ... Tweak DNS debugging	2017-03-06 05:50:37 -08:00
DL6ER	47a6786e8f	Use proper test syntax	2017-03-06 14:02:56 +01:00
DL6ER	a69fcbb91e	Bugfix for when deleting host-record	2017-03-06 13:44:13 +01:00
Dan Schaper	8e2b51b391	Merge pull request #1296 from pi-hole/fix/debugVersion ... Debug version detection improvements	2017-03-05 07:13:41 -08:00
Dan Schaper	560af43204	Merge pull request #1293 from pi-hole/fix/version ... Account for hash in versioning	2017-03-05 07:10:18 -08:00
DL6ER	9c119f919e	Merge pull request #1298 from pi-hole/new/teleporter ... Add CLI Teleporter feature	2017-03-05 15:05:07 +01:00
DL6ER	baefec86f2	Add CLI teleporter feature	2017-03-05 14:08:44 +01:00
raincoats	eb763d2dc2	Redirect to admin panel when accessing 'http://pi.hole/' ... If someone tries to access 'http://pi.hole/', it will take them to the "Website blocked" page. Very confusing if you don't know to go to 'http://pi.hole/admin/'. This just redirects them to the admin panel.	2017-03-05 16:58:21 +11:00
Dan Schaper	512c650441	Shellchecking. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 19:07:55 -08:00
Dan Schaper	dc44fc9e27	Version check amalgamation and removal of && || logic. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 17:54:38 -08:00
Dan Schaper	05640f9a6b	Merge pull request #1295 from pi-hole/tweak/pullapprove ... Require 4 approvals instead of five for merging into master	2017-03-04 15:17:25 -08:00
Dan Schaper	6f2fb57c08	Protocol specific records checks. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 15:16:33 -08:00
Dan Schaper	2547cc4c8d	Only run IPv6 if enabled, split out Chaos TXT checks. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 15:06:34 -08:00
DL6ER	112ddb3c77	Require 4 approvals instead of five for merging into master	2017-03-04 22:57:37 +01:00
DL6ER	9f4ef66f41	Add IPv6 resolver test	2017-03-04 22:38:52 +01:00
DL6ER	086f0790fc	Add Google's IPv6 address for potential IPv6 resolver tests	2017-03-04 22:31:18 +01:00
Dan Schaper	709b44f736	IPv4 DNS tests ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 12:16:43 -08:00
Dan Schaper	6cd4ff6d68	Organize functions and function calls. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 12:16:32 -08:00
Dan Schaper	abd3e828de	Optimize normalOutput ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-04 07:46:00 -08:00
DL6ER	b85af50d14	Generate only the information that is actually asked for	2017-03-04 14:08:11 +01:00
Dan Schaper	0e8fd49669	Function... ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 23:30:57 -08:00
Dan Schaper	945e22874e	Collapse duplicate functions, and take out argument loops. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 23:12:28 -08:00
Dan Schaper	77ab47a984	Awk for perl ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 22:34:55 -08:00
Dan Schaper	ed8088f203	Functions for Core/Web version and hash. And only check first argument in each section. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 22:10:32 -08:00
Dan Schaper	8831b22fc8	Prototype function for getting version of local repo ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 21:36:38 -08:00
Dan Schaper	0341bd1758	Optimize code, undoc flag for current hash. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 20:32:26 -08:00
Dan Schaper	9bb4a5fb25	Factor out variables from display. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 20:16:53 -08:00
Dan Schaper	ebfffea5dc	Always show something, even if it's just the short hash of the latest commit. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 20:04:55 -08:00
Dan Schaper	81939ab265	Get short hash of local and remote ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-03 19:14:30 -08:00
DL6ER	f2fe84c9d3	Merge pull request #1292 from pi-hole/master ... Merge patches back into devel	2017-03-03 23:45:29 +01:00
DL6ER	051f463350	Merge pull request #1291 from pi-hole/fix/defaultlisteningbehavior ... Fix default listening behavior of dnsmasq	2017-03-03 23:33:44 +01:00
DL6ER	f626406685	Revert #1273	2017-03-03 23:14:12 +01:00
DL6ER	dd971b6ee5	Default behavior is old behavir (listen on gravity interface (e.g. eth0), permit all origins)	2017-03-03 22:58:41 +01:00
Dan Schaper	8776b822db	Merge pull request #1287 from pi-hole/fix/update_fail ... Exit script immediately if we can't update package cache.	2017-03-03 12:20:29 -08:00
DL6ER	fc76b1a6a3	Merge pull request #1244 from pi-hole/new/FTL-binary ... FTL	2017-03-03 13:41:27 +01:00
DL6ER	9183200b6f	Merge pull request #1286 from pi-hole/tweak/dpkg_lock ... Test for dpkg lock before using apt-get	2017-03-03 13:39:40 +01:00
DL6ER	f1b8abf503	Merge pull request #1146 from pi-hole/tweak/chronometer_recentlyblocked ... [FTL] Show most recently blocked domain in chronometer	2017-03-03 12:20:43 +01:00
DL6ER	9502356980	Move test_dpkg_lock to initial UPDATE_PKG_CACHE. There was unpredictable interference with debconf-apt-progress	2017-03-03 11:55:15 +01:00
DL6ER	a535ca9db4	Some tweaks to the new dpkg lock detector	2017-03-03 11:55:13 +01:00
DL6ER	2c762899de	Add loop to wait if package manager is blocked externally	2017-03-03 11:55:10 +01:00
Dan Schaper	24fd23493d	Exit script immediately if we can't update package cache. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-02 15:54:58 -08:00
Dan Schaper	6f1ed28d0a	Merge pull request #1274 from pi-hole/development ... Pi-hole Core v2.13	2017-03-02 14:34:43 -08:00
DL6ER	66b7d04b82	Merge branch 'development' into new/FTL-binary	2017-03-01 12:42:48 +01:00
DL6ER	044afa838c	Merge pull request #1284 from pi-hole/new/dnsmasqListeningBehavior ... Setup interface listening behavior of dnsmasq	2017-03-01 12:20:59 +01:00
DL6ER	7ba47f504c	Add special "except-interface" line in case of listening on all interfaces	2017-03-01 12:15:04 +01:00
DL6ER	0be1717ff4	Fix config error	2017-03-01 11:46:48 +01:00