Commit graph

1794 commits

Author SHA1 Message Date
DL6ER
9af26cbaac Major simplification of webpage.sh 2016-12-28 02:14:47 +00:00
Dan Schaper
73741f1518 Merge pull request #1046 from pi-hole/tweak/subshells
Tweak/subshells
2016-12-27 16:00:07 -08:00
Dan Schaper
6abd6d8879 Merge pull request #991 from pi-hole/webUIprivacymode
Backend for privacyMode on webUI
2016-12-27 12:46:54 -08:00
DL6ER
321ea8a3a9 Merge branch 'development' into webUIprivacymode 2016-12-27 21:27:11 +01:00
Dan Schaper
4d6263872d
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells 2016-12-27 12:25:49 -08:00
Dan Schaper
fcdd58ac94 Merge pull request #1033 from pi-hole/updater_rewrite
update.sh code refactoring
2016-12-27 12:22:17 -08:00
Dan Schaper
ef8292d371 Merge branch 'development' into updater_rewrite 2016-12-27 11:59:52 -08:00
Dan Schaper
bc6a985f7c
Merge branch 'development' of github.com:pi-hole/pi-hole into tweak/subshells 2016-12-27 11:53:46 -08:00
Dan Schaper
7320fc11d2
Check command -v directly, instead of subshelling out.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 11:53:23 -08:00
Dan Schaper
51f6d75db4 Merge pull request #1045 from pi-hole/tweak/always_update
Always update package cache where we can.
2016-12-27 11:51:00 -08:00
Dan Schaper
a328326e39
Formatting
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 11:41:07 -08:00
Dan Schaper
4eedf8a746
Always update package cache where we can.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-27 10:59:24 -08:00
Dan Schaper
c5f5252145 Merge pull request #961 from pi-hole/customblockpage
Custom Pi-Hole block page
2016-12-27 10:25:03 -08:00
Mcat12
7fadd469c9 Merge pull request #1038 from pi-hole/fix/IPV6_detection
Check IPv6 routing
2016-12-27 11:42:23 -05:00
Mcat12
823e874d20 Merge pull request #1037 from pi-hole/tweak/IPv4_multi_address
Smarter pick of IPv4 address
2016-12-27 11:42:00 -05:00
Dan Schaper
62d001225a Merge pull request #1040 from pi-hole/fix/updater_git-C
Remove git -C from update.sh
2016-12-25 12:28:42 -08:00
DL6ER
e50947eb58
mend 2016-12-25 21:26:06 +01:00
DL6ER
ca056d32d2
Remove git -C 2016-12-25 21:22:59 +01:00
DL6ER
63a455f4f7 Merge pull request #1039 from pi-hole/revert_crontab_change
Revert PR #1018
2016-12-25 18:35:59 +01:00
DL6ER
a0e0465036
Revert "Merge pull request #1018 from pi-hole/diginc-patch-1"
This reverts commit ff3c36a7a2, reversing
changes made to 9355a8ad0e.
2016-12-25 17:32:59 +01:00
DL6ER
e15548cbf5
Add --quiet to git fetch in GitCheckUpdateAvail() 2016-12-25 01:18:58 +01:00
DL6ER
5e28e6b9ac
Removed remaining git -C 2016-12-25 01:17:46 +01:00
DL6ER
c78d43f640 Merge pull request #1032 from pi-hole/fix/emptypassword
Save empty password
2016-12-25 00:51:21 +01:00
Dan Schaper
da41383476
Check IPv6 to see if the route is reachable, if not, don't use.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 15:26:05 -08:00
Dan Schaper
6ff79835da
If only one interface available, don't show whiptail, just use that interface.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 15:08:39 -08:00
Dan Schaper
1d608b204a
Only allow UP interfaces to be selected. (DOWN interfaces would have not given IP addresses anyways.)
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 14:50:50 -08:00
Dan Schaper
c2b8bed3a8
Get the IP address that is the source for the default route out. Fixes interfaces with multiple IP's assigned getting the wrong IPv4 chosen.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 14:43:57 -08:00
Dan Schaper
3365ef7aaa
is_repo() returns values to caller, silence function.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:54:04 -08:00
Dan Schaper
68c17b26dc
Bashisms
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:41:42 -08:00
Dan Schaper
e647efd471
Shell script, not javascript
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2016-12-24 11:24:20 -08:00
DL6ER
15db1ffdd5
Remove variables not needed any more 2016-12-24 15:48:43 +01:00
DL6ER
4632b0f797
Updated updater logic 2016-12-24 15:40:31 +01:00
DL6ER
65c35a5530
Use new subroutine to determine if updates are available 2016-12-24 15:32:25 +01:00
DL6ER
c449a1c0e0
Added GitCheckUpdateAvail() 2016-12-24 15:19:39 +01:00
DL6ER
b020010f0d
Removed some of the &> /dev/null 2016-12-24 15:08:30 +01:00
DL6ER
0276c72fe2
replace 'git -C' with long version (see #1009) 2016-12-24 15:05:57 +01:00
DL6ER
04a9791be2
Save empty password 2016-12-23 23:41:40 +01:00
Mcat12
ffd31d8330 Merge pull request #1031 from pi-hole/templates
replace 1-10 checkboxes to tidy up appearance
2016-12-23 16:06:29 -05:00
Promofaux
d89254fedf replace 1-10 checkboxes to tidy up appearance 2016-12-23 19:49:39 +00:00
Mcat12
a771ddf667 Merge pull request #1030 from pi-hole/readmeTypos
Accidentally a word.
2016-12-23 14:43:56 -05:00
Promofaux
ce2e410468 Accidentally a word.
Updated link
2016-12-23 19:39:37 +00:00
Adam Warner
c1982c04ff Merge pull request #1029 from pi-hole/bogusDNS_BOGUS_PRIVentries
remove `DNS_BOGUS_PRIV` from setupVars.conf
2016-12-23 19:32:13 +00:00
Promofaux
9a62026830 remove DNS_BOGUS_PRIV from setupVars.conf 2016-12-23 19:27:02 +00:00
Adam Warner
d12efccd0b Merge pull request #1028 from pi-hole/bcambl-selinux_notification
Bcambl selinux notification
2016-12-23 17:36:33 +00:00
Mcat12
54afffed19 Remove newline
Issue was already fixed
2016-12-23 12:30:33 -05:00
Mcat12
fc8fcdbece Add newline 2016-12-23 12:28:18 -05:00
Promofaux
abd1fedc9d . 2016-12-23 17:25:55 +00:00
Promofaux
9725985037 printf to echo. idgaf 2016-12-23 17:24:33 +00:00
Promofaux
754f3359ec too many echos spoil the branch 2016-12-23 17:22:31 +00:00
Promofaux
4c131b8c28 newlines 2016-12-23 17:21:23 +00:00