418 Commits (c99a8a9b15769ea9dc4bb7663f4be05e03e8bcdc)

 

All Branches   

Search

Author	SHA1	Message	Date
Promofaux	c99a8a9b15	initial commit	9 years ago
Dan Schaper	48db85187e	Merge pull request #219 from jacobsalmela/master ... Update Development	9 years ago
Dan Schaper	d1e054d713	Merge pull request #216 from mechaxl/master ... Fixing minor typos in basic-install.sh	9 years ago
Kenneth Koski	ce578534fe	Fixing minor typos in basic-install.sh	9 years ago
Dan Schaper	c7c4a5c602	Merge pull request #215 from jacobsalmela/development ... Merge development into master	9 years ago
Promofaux	3f40a95929	Whoops, should probably commit more often. Massive overhaul. Cleaned up output, less verbose (will still output errors, but gets rid of anything not needed) Added a spinner so users don't think it has stalled	9 years ago
Promofaux	5c25c42da8	Make installPiholeWeb() more inteliigent. Checks for existence of /var/www/html/pihole, and only downloads from repo if it does not exist. Will stop install script from overwriting any tweaks users have made to index.html	9 years ago
Promofaux	96011bc2ae	make InstallWebAdmin() a bit more intelligent, and less verbose. Checks if installing over an existing installation, and if so, will remove existing webadmin folder.	9 years ago
Promofaux	4f59577fd1	Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root	9 years ago
Dan Schaper	494fcd60ab	Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development	9 years ago
Mcat12	544919175c	Added back in debugging response header	9 years ago
Mcat12	ede8f4714f	Removed extra http redirect	9 years ago
Dan Schaper	b512496818	Merge pull request #207 from jacobsalmela/bugfix/Chronometer ... Bugfix for Chronometer	9 years ago
Dan Schaper	8094f7234c	Merge pull request #202 from PromoFaux/FixChronometer ... Fix chronometer	9 years ago
Dan Schaper	7dfd9f0378	Merge pull request #205 from PromoFaux/InstallScript ... Clean /etc/pihole/list.* during `basic-install.sh` to set a baseline for install procedures. Fixes #195. Submitted by @PromoFaux.	9 years ago
Promofaux	bc51f88805	Check if any list.* files exist from previous installation, if they do delete them.	9 years ago
Dan Schaper	e04e2537a8	Merge pull request #203 from jacobsalmela/master ... Merge master into development	9 years ago
Promofaux	af982a02af	Move call to CheckIPv6 function into CalcBlockedDomains, rather than relying on remembering to call it before you call CalcBlockedDomains.	9 years ago
Jacob Salmela	03277899ca	Merge pull request #199 from PromoFaux/master ... Update Readme to link to whitelist/blacklist wiki page	9 years ago
Adam Warner	6756843be7	Merge pull request #2 from PromoFaux/PromoFaux-patch-1 ... Update README.md	9 years ago
Adam Warner	ac35417ab0	Update README.md ... Updated Whitelist/Blacklist section - added link to wiki Added information about `chronometer.sh -j`	9 years ago
Adam Warner	092c951078	Merge pull request #1 from jacobsalmela/master ... Merge from upstream	9 years ago
Jacob Salmela	9ba38e668a	Merge pull request #193 from PromoFaux/Chronometer ... Major overhaul of chronometer script	9 years ago
Adam Warner	f665899116	Update chronometer.sh ... weirdness	9 years ago
Adam Warner	de464e17cc	Update chronometer.sh ... Note to self, Find&Replace>Replace All is a bad idea.	9 years ago
Adam Warner	0eed56380d	Update chronometer.sh ... What, me? Reference the wrong file?	9 years ago
Promofaux	487c26db44	Major overhaul. Added -j option to output stats as JSON formatted string. If run with no option, then chronometer runs as normal. Fixed calculations to match those on the web dashboard.	9 years ago
Jacob Salmela	0a57b43f09	C.H.I.P. ad blocking project	9 years ago
Jacob Salmela	48f8d7ed0f	pi-hole mentioned in a podcast ... Worth a good laugh when they say "shut your pie hole!"	9 years ago
Jacob Salmela	d77399727c	Merge pull request #189 from jacobsalmela/whitelist ... Switched CRLF to LF (DOS to UNIX)	9 years ago
Jacob Salmela	56ea07c1ec	Merge pull request #187 from PromoFaux/whitelist ... Switched CRLF to LF (DOS to UNIX)	9 years ago
Promofaux	414ef54cfe	Switched CRLF to LF (DOS to UNIX)	9 years ago
jacobsalmela	0a0f00da3b	fixes #169 ... exits if sudo is not installed when run as a regular user	9 years ago
jacobsalmela	bee109c784	better uninstall ... More from JoshKastang. This closes #153 as it is the last step from his ideas.	9 years ago
jacobsalmela	5d608a2db5	leave system cron alone ... Taking JoshKastang’s idea from #153, the system cron file will be left alone and the pihole.cron gets its own.	9 years ago
jacobsalmela	7c6ef0cfd0	privileged install ... This puts sudo in a variable if run as a regular user. If already running as root, the script proceeds as normal. Not a perfect fix, but should help for install on other systems.	9 years ago
Jacob Salmela	0cf859344a	Merge pull request #176 from xd1936/patch-1 ... Install Figlet Fonts with Toilet	9 years ago
jacobsalmela	6125b2520b	install git for updateDashboard.sh ... I also download and chmod the script	9 years ago
jacobsalmela	bd5ed2bcf0	move webinterface.sh into scripts folder ... I also renamed it to make it is easier to identify.	9 years ago
Jacob Salmela	a2a58f7b39	Merge pull request #180 from jacobsalmela/whitelist ... Whitelist/blacklist improvements	9 years ago
Jacob Salmela	87980c6df8	Merge pull request #174 from PromoFaux/whitelist ... Whitelisting changes	9 years ago
Promofaux	f9a2ca5c32	Tidy up help text on both scripts. Add quiet help.	9 years ago
Leo	665dfdfe8e	Install Figlet Fonts with Toilet ... Some OS' don't have Figlet Fonts, which causes `chronometer.sh` to have `error: font small not found` instead of the pretty "Pi-hole" display	9 years ago
Adam Warner	2b0bee085b	Incorrect reference to whitelist in the blacklist.sh comments :)	9 years ago
Adam Warner	ddfefb291d	Merge branch 'Whitelistingchanges' into whitelist	9 years ago
Adam Warner	5d842a7533	Merging	9 years ago
Adam Warner	2284a27814	Consumes blacklist.sh now, too.	9 years ago
Adam Warner	f68cf10efa	Tidied up a couple of things	9 years ago
Adam Warner	89e3c25a90	Behaves like whitelist, but on the blacklist	9 years ago
Adam Warner	6b1f14647c	add reference to blacklist.sh	9 years ago