3288 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jacob Salmela	5e16487ef6	add ascii berry to beginning of installer	2017-03-08 21:14:21 -06:00
DL6ER	2b3afbfef8	Merge pull request #1310 from pi-hole/new/piholecheckout ... Pi-hole checkout feature	2017-03-09 00:43:35 +01:00
Dan Schaper	c3c7dcc9f5	Merge remote-tracking branch 'origin/new/piholecheckout' into new/piholecheckout	2017-03-08 15:32:14 -08:00
Dan Schaper	273728b481	One more argument to shift. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 15:32:06 -08:00
DL6ER	81a1057cac	Fix something Dan has overlooked	2017-03-09 00:30:36 +01:00
DL6ER	fd310c6445	Back to how we had it before, because --unshallow does not work at all	2017-03-09 00:28:02 +01:00
Dan Schaper	a9b52518bf	Shift numbers for argument identifiers, functions are called after shift ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 14:29:51 -08:00
Dan Schaper	87da40068c	Always exited with value 1, now exits with proper value. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 14:18:08 -08:00
Dan Schaper	b8f1eadb7f	Shift off checkout from being passed to script from pihole ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 14:17:56 -08:00
Dan Schaper	b522d8eaf6	Source and reuse existing variables, centralize code. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 13:41:11 -08:00
Dan Schaper	89ff99322d	Don't need to remember pwd inside a function, calling function doesn't change directories. ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 13:30:08 -08:00
Dan Schaper	56e17d1010	Source functions and variables from basic-install.sh ... Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>	2017-03-08 13:28:24 -08:00
DL6ER	708067e875	Merge pull request #1309 from pi-hole/new/FTLChronometer ... Remove duplicated line	2017-03-08 13:27:11 +01:00
DL6ER	d2ab0694b7	Add "master" shortcut	2017-03-08 13:18:34 +01:00
DL6ER	8a14a63d5d	Pi-hole checkout feature	2017-03-08 13:16:40 +01:00
DL6ER	8235b18854	Remove duplicated line	2017-03-08 12:09:34 +01:00
DL6ER	e0e9ebbe74	Merge pull request #1307 from pi-hole/fix/versionwithoutwebinterface ... Don't try to obtain version of web interface it it is not installed	2017-03-07 23:54:32 +01:00
DL6ER	6e6259975e	Merge pull request #1308 from pi-hole/new/FTLChronometer ... Let Chronometer query all data from FTL directly	2017-03-07 19:41:23 +01:00
DL6ER	10bc8414b9	Move FTL querying before clearing the terminal to avoid flashing on Pi B+	2017-03-07 18:10:05 +01:00
DL6ER	4e25e0dc5c	Add missing } to JSON output	2017-03-07 17:57:57 +01:00
DL6ER	b1a9793d94	Let Chronometer query all data from FTL (no need for having the API). Fixes #1305	2017-03-07 17:54:11 +01:00
DL6ER	6dea00668e	Don't try to obtain version of web interface it it is not installed. Fixes #1303	2017-03-07 13:08:01 +01:00
DL6ER	ae9182c92e	Merge pull request #1301 from pi-hole/fix/removewildcard ... Remove wildcard entry when adding the very same domain either the white- or blacklist	2017-03-06 23:53:06 +01:00
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