454 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Chad Howell	ae336da7a1	Fix formatting, use consistent style, add comments ... Fix formatting, use consistent style, add comments	2016-01-27 01:11:38 -05:00
Promofaux	6b76270889	Remove spinner call when adding URLs of adlist to array.. seems to break it.	2016-01-24 22:30:12 +00:00
PromoFaux	5d040f45c8	Merge pull request #239 from pi-hole/development ... Development	2016-01-24 22:12:04 +00:00
Promofaux	cebdcc71a7	Add $SUDO call to spinner() in gravity.sh	2016-01-24 21:27:25 +00:00
Promofaux	eec14be10d	add $SUDO into spinner control.	2016-01-24 21:19:23 +00:00
Promofaux	c179936b54	add $SUDO	2016-01-24 20:49:37 +00:00
Promofaux	649a565801	run apt-get install as sudo when resolving dependencies	2016-01-24 20:35:24 +00:00
Promofaux	2d4ebf5eb5	FIX CONFLICTS	2016-01-24 20:29:22 +00:00
Promofaux	754beed3a1	Bring up to date with master	2016-01-24 20:22:41 +00:00
Promofaux	df5059944b	Merge branch 'Promofaux-InstallRework' into development	2016-01-24 18:51:10 +00:00
Promofaux	9f0927351d	Merge from #236	2016-01-24 18:49:25 +00:00
Promofaux	736edf44e4	Added date check before running apt-get update/upgrade. Wont run apt-get update/upgrade if it has already been run today	2016-01-24 17:53:27 +00:00
Promofaux	8ecf8eb76c	output to match other scripts	2016-01-24 17:18:37 +00:00
Promofaux	3cd1a5b1d5	... Helps if I add the changes to the repo file, and not the test file on my pi.	2016-01-24 16:51:54 +00:00
Promofaux	39507b9d0d	Added echo ':::' to the top of the file	2016-01-24 16:47:38 +00:00
Promofaux	dfcf9d133e	Make output make a bit more sense	2016-01-24 16:46:00 +00:00
Promofaux	8a74942da7	Cleaned up output before running gravity.sh	2016-01-24 16:41:11 +00:00
Promofaux	2fe42138c7	removed a space	2016-01-24 16:37:15 +00:00
Promofaux	1563146918	improvements to git functions (passing parameters). Added >/dev/null to attempt to supress output from apt-get upgrade	2016-01-24 16:33:53 +00:00
Promofaux	cf3aea8075	uncomment the apt-get update/upgrade!	2016-01-24 15:27:40 +00:00
Promofaux	a539dc41f3	Tidy up gravity output to match install script	2016-01-24 15:25:24 +00:00
Promofaux	6cea480210	Huge update! Base files now cloned from github (or updated if already existing) and copied out to the correct directories. Web admin interface is now cloned from hithub (or updated if already existing). Packages are checked before we go ahead and try to install them anyway.	2016-01-24 03:31:12 +00:00
PromoFaux	3b4bb48a0f	Merge pull request #234 from ChadBHowell/CBH---Dependencies ... Add unzip to the dependencies	2016-01-24 00:13:49 +00:00
Promofaux	206717828b	Improve spinner function.	2016-01-23 22:25:30 +00:00
Chad Howell	316d26ede2	Add unzip to the dependencies ... unzip is required for the install script to complete. Some distros do not have it installed by default.	2016-01-23 16:29:52 -05:00
Jacob Salmela	f2e471707e	Pi-hole chrome extension	2016-01-23 12:39:09 -06:00
Dan Schaper	1e735c26c4	Repo Change QuickFix ... QuickFix for Repo location change.	2016-01-22 20:46:10 -08:00
PromoFaux	7c5df5dfe3	Merge pull request #229 from PromoFaux/TransferPrep ... Changed URLs in installScripts() to match new organisation links	2016-01-23 01:34:47 +00:00
PromoFaux	5b62f91bb4	Update README.md ... Whoops, forgot the readme.. *embarrassed face*	2016-01-23 01:31:33 +00:00
Promofaux	e8b8fb0835	s	2016-01-23 00:23:32 +00:00
Promofaux	6663ced38d	Initial commit	2016-01-23 00:13:16 +00:00
Dan Schaper	0b03264fb0	Merge pull request #225 from jacobsalmela/bugfix/createPiholeDir ... Bugfix/create pihole dir	2016-01-22 16:11:15 -08:00
Promofaux	c99a8a9b15	initial commit	2016-01-22 20:30:32 +00:00
Dan Schaper	ea0fb15ff2	Move creation of pihole directory out of IPv6 function	2016-01-22 19:48:55 +00:00
Adam Warner	05a59b17be	Changed URLs in installScripts() to match new organisation links	2016-01-22 16:50:01 +00:00
Leo	8b18fdd322	Update gravity.sh	2016-01-21 17:19:09 -05:00
Leo	1349f584be	Use Sudo Detection from Installer in Gravity.sh Also ... Prevents errors from being thrown when gravity.sh is run as root and the user doesn't have sudo installed (just like install.sh does)	2016-01-21 17:14:55 -05:00
Dan Schaper	48db85187e	Merge pull request #219 from jacobsalmela/master ... Update Development	2016-01-21 12:19:12 -08:00
Dan Schaper	d1e054d713	Merge pull request #216 from mechaxl/master ... Fixing minor typos in basic-install.sh	2016-01-21 09:48:44 -08:00
Kenneth Koski	ce578534fe	Fixing minor typos in basic-install.sh	2016-01-21 11:33:49 -06:00
Dan Schaper	c7c4a5c602	Merge pull request #215 from jacobsalmela/development ... Merge development into master	2016-01-21 08:42:53 -08:00
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	2016-01-20 23:34:18 +00:00
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	2016-01-20 22:14:17 +00:00
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.	2016-01-20 22:02:54 +00:00
Promofaux	4f59577fd1	Remove SUDO from line that runs gravity.sh to stop files in /etc/pihole being owned by root	2016-01-20 21:20:52 +00:00
Dan Schaper	494fcd60ab	Merge branch 'development' of https://github.com/jacobsalmela/pi-hole into development	2016-01-20 05:25:49 +00:00
Mcat12	544919175c	Added back in debugging response header	2016-01-20 05:23:30 +00:00
Mcat12	ede8f4714f	Removed extra http redirect	2016-01-20 05:23:15 +00:00
Dan Schaper	b512496818	Merge pull request #207 from jacobsalmela/bugfix/Chronometer ... Bugfix for Chronometer	2016-01-19 17:42:41 -08:00
Dan Schaper	8094f7234c	Merge pull request #202 from PromoFaux/FixChronometer ... Fix chronometer	2016-01-19 17:39:46 -08:00