2526 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dan Schaper	472708376d	Split out IP checks.	2017-02-16 18:30:15 -08:00
Dan Schaper	cfed3d59e9	Begin fixing IP detection functions.	2017-02-16 16:49:14 -08:00
Adam Warner	95fd9d4863	Merge pull request #1248 from IanOliver/patch-3 ... Update malwaredomains.com and mahakala.is URLs to HTTPS	2017-02-16 08:07:18 +00:00
Ian Oliver	c89bca6ec8	Update malwaredomains.com and mahakala.is URLs to HTTPS	2017-02-15 21:31:42 +00:00
Dan Schaper	ee262c30c2	Merge pull request #1245 from pi-hole/readme/magic-mirror-project ... add magic mirror project link to readme	2017-02-14 19:21:27 -08:00
Jacob Salmela	6b8240d4de	add magic mirror project link to readme	2017-02-14 20:25:11 -06:00
DL6ER	4035c933df	Moved echo to else block	2017-02-13 16:50:48 +01:00
DL6ER	abd44dd284	Add 32bit message	2017-02-13 16:33:22 +01:00
DL6ER	95d7fe76b5	Make comments more pretty	2017-02-13 14:50:25 +01:00
DL6ER	a052f397fe	Be more verbose during install	2017-02-13 14:47:06 +01:00
DL6ER	09d6e73b0a	Don't print error message on 32bit platforms	2017-02-13 14:42:11 +01:00
DL6ER	7fb6b71d52	Fix install path	2017-02-13 14:40:31 +01:00
DL6ER	07e37d7fc3	Proper error handling	2017-02-13 11:33:09 +01:00
DL6ER	fbe3dc0dcd	Have to get latest tag via GitHub API for downloading the binaries	2017-02-13 11:27:52 +01:00
DL6ER	6018c0c2fc	Add FTLinstall()	2017-02-13 11:07:29 +01:00
DL6ER	52a2f166fd	Add FTLdownload() subroutine	2017-02-13 10:29:27 +01:00
Jacob Salmela	26cb6a1929	redirect pi.hole to pi.hole/admin	2017-02-11 20:46:27 -06:00
Jacob Salmela	7c63bbfe44	Merge pull request #1233 from ProtoFoo/patch-1 ... Add manual edit warnings to lighttpd.conf.* files	2017-02-11 08:10:35 -06:00
Adam Warner	109026222e	Merge pull request #1237 from IanOliver/patch-1 ... Spelling corrections in adlists.default comments	2017-02-10 23:43:11 +00:00
DL6ER	af8e629df4	Merge pull request #1239 from pi-hole/tweak/debug48h ... Change description as we want to save the debug log for 48h instead of only 24h	2017-02-10 20:46:12 +01:00
DL6ER	f7f1daa69f	Merge pull request #1238 from pi-hole/tweak/debugLogdnsmasq ... Scan whole dnsmasq.d directory for cofigurations files	2017-02-10 20:46:01 +01:00
DL6ER	01f980d49c	Change description as we want to save the debug log for 48h instead of only 24h	2017-02-10 17:45:20 +01:00
DL6ER	99fab7e52a	Scan whole dnsmasq.d directory for cofigurations files	2017-02-10 17:42:37 +01:00
Ian Oliver	692292b1d4	Spelling corrections in comments	2017-02-10 11:22:14 +00:00
Mcat12	cd608d9d5b	Merge pull request #1182 from pi-hole/adminPageAsOption ... Give user the choice to install web admin or not	2017-02-09 20:20:08 -05:00
Mcat12	ba67144e34	Merge branch 'development' into adminPageAsOption	2017-02-09 16:27:07 -05:00
ProtoFoo	162d9d7d57	Add manual edit warning ... Added text block from 01-pihole.conf to warn user that manual changes to lighttpd config will be overwritten. Slight cosmetic adjustments (tabs -> spaces).	2017-02-09 17:00:52 +01:00
ProtoFoo	357f5a2cfd	Add manual edit warning ... Added text block from dns config file to warn user that manual changes to lighttpd config will be overwritten. Slight cosmetic adjustments (tabs -> spaces).	2017-02-09 16:46:55 +01:00
Mcat12	d1ca32b0a5	Merge pull request #1231 from pi-hole/fix/iproute_deps ... Update basic-install.sh	2017-02-09 10:12:05 -05:00
Dan Schaper	34f326c559	Update basic-install.sh	2017-02-08 14:13:49 -08:00
DL6ER	7785dac50e	Merge pull request #1228 from r0ckarong/development ... Justify and improve help texts, add missing wildcard description	2017-02-08 14:05:53 +01:00
Markus Napp	01f643e5eb	fixup! Fix spacing for wildcard help in list script	2017-02-08 12:56:28 +01:00
Markus Napp	8037f3e332	Fix spacing for wildcard help in list script	2017-02-08 12:55:14 +01:00
Markus Napp	19e30b829a	Add wildcard description to help text, improve other help texts	2017-02-08 12:42:14 +01:00
Markus Napp	afe5176e01	Justify help output to match main script	2017-02-08 12:41:53 +01:00
Mcat12	a48317883d	Fix indentation	2017-02-07 18:14:41 -05:00
DL6ER	5ac92ae4eb	Merge pull request #1222 from pi-hole/fix/installer ... Remove double echos	2017-02-07 09:21:22 +01:00
DL6ER	8fb6ba19a1	Remove double echos	2017-02-06 12:06:38 +01:00
Dan Schaper	314f7e7889	Merge pull request #1183 from pi-hole/tweak/update_cache_trap ... Trap for package cache update failures.	2017-02-05 16:04:19 -08:00
Promofaux	4fcf8fd23f	Merge in development branch - resolve conflict in update.sh	2017-02-05 19:39:02 +00:00
Promofaux	10a30344e5	No need to source setupVars, as basic-install.sh is sourced, which sources setupVars itself. Sourception.	2017-02-05 19:29:56 +00:00
Promofaux	1206dda347	testing putting runGravity at a different part of the script	2017-02-05 19:23:04 +00:00
Promofaux	b764d17c64	comment	2017-02-05 19:18:27 +00:00
Promofaux	ba0abdb88d	wrap update logic in admin_installed bool check	2017-02-05 19:12:09 +00:00
Promofaux	1428b58dde	source setupVars and only check admin repo if it is enabled	2017-02-05 19:07:04 +00:00
Promofaux	e57425df5f	0.0.0.0 instead of pi-holes IP address for redirect purposes	2017-02-04 15:25:11 +00:00
Jacob Salmela	5e7dfaf220	Merge pull request #1214 from pi-hole/tweak/readme-updates ... Update README with latest version screenshots and remove Raspberry references	2017-02-03 15:43:31 -06:00
Jacob Salmela	ad5c011b6c	Add new screenshots from latest version	2017-02-03 15:33:44 -06:00
Jacob Salmela	fcdd33b585	Update and remove old FAQ links	2017-02-03 15:21:42 -06:00
Jacob Salmela	f767f066ad	Update outdated text and describe features from recent versions	2017-02-03 15:18:28 -06:00