tyler.durden
/
pi-hole
mirror of https://github.com/pi-hole/pi-hole.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,950 Commits 11 Branches 110 Tags 33 MiB
Commit Graph

1950 Commits

Author SHA1 Message Date
DL6ER f082b5ba54 Merge pull request #1001 from pi-hole/cleanup/remove_legacy_detect 
Remove v1 legacy detection code.
 2016-12-21 13:49:34 +01:00
DL6ER 8841bdd252
Reset the if's 2016-12-21 12:57:02 +01:00
DL6ER 58261098fb
We should not call a function that Dan deleted 2016-12-21 12:07:44 +01:00
DL6ER 9432d3035a
Merge branch 'development' into cleanup/remove_legacy_detect 
Conflicts:
	automated install/basic-install.sh
 2016-12-21 12:01:58 +01:00
DL6ER 9907fc2770
Merge branch 'development' into fix/install_deps_exit 
Conflicts:
	automated install/basic-install.sh
 2016-12-21 11:54:52 +01:00
DL6ER d42caa8672 Merge pull request #1000 from pi-hole/fix/tab_space 
Tabs to spaces and formatting.
 2016-12-21 11:41:30 +01:00
Dan Schaper 8117ec8e20
Remove v1 legacy detection code. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-20 17:50:44 -08:00
Dan Schaper ff2783f9fc
Tabs to spaces and formatting. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:22:57 -08:00
Dan Schaper 156a51c945
Remove extra display only variable. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:04:46 -08:00
Dan Schaper c72ffae4a2
Don't install extra packages (openresolv was installed over resolvconf). No longer need --fix-missing. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 17:02:51 -08:00
Dan Schaper 7f3b0030ea
LF 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 16:47:43 -08:00
Dan Schaper 9a626948f8
Use debconf for Deb/Ubu package installations. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>

Alphabetic sort of dependency names

Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 16:22:31 -08:00
Dan Schaper 5c43df66a8
Remove spinner function, masked return values. 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 16:22:08 -08:00
Dan Schaper d0e3c546f8
CRLF to CR (Win to Unix line endings) 
Signed-off-by: Dan Schaper <dschaper@ganymeade.com>
 2016-12-20 15:00:37 -08:00
DL6ER a9cb93d801 Merge pull request #998 from pi-hole/LordKelvin 
Lord Kelvin
 2016-12-20 17:54:52 +01:00
DL6ER ee8f29d178 Fixed typo, extended help text 2016-12-20 16:28:28 +01:00
DL6ER da363070c7 Added Kelvin 2016-12-20 12:21:08 +01:00
DL6ER 50cf891e01 Merge pull request #996 from pi-hole/allowemptysecondDNSserver 
Allow disabling second DNS server
 2016-12-19 19:30:27 +01:00
DL6ER 715838cf89 Allow disabling second DNS server 2016-12-19 13:42:42 +01:00
DL6ER cd0c3f9418 Better output if file has not been downloaded because it has not been changed 2016-12-17 23:46:28 +01:00
DL6ER efaee2b68b Improvements for gravity (errors shouldn't be able to escape the black hole if even light cannot do this!) 2016-12-17 23:33:09 +01:00
DL6ER 372c699cc6 Merge pull request #993 from pi-hole/fix/one_step_refactor 
Rename variables in one step
 2016-12-17 00:15:20 +01:00
Dan Schaper 8cb01cdd29
One step to rename variables. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2016-12-16 15:08:30 -08:00
DL6ER 7a243f890e Backend for privacyMode on webUI 2016-12-16 17:33:01 +01:00
Adam Warner 10982a0f45 Merge pull request #990 from pi-hole/dontkillsetupVars.conf 
Don't kill setupVars.conf on update/fresh install
 2016-12-16 13:55:33 +00:00
DL6ER d4c378ed5d Remove PIHOLE_INTERFACE if already set (not PIHOLE_DOMAIN) 2016-12-16 13:20:25 +01:00
DL6ER 7872f68a45 Only try to remove parts inthe file if the file already exists 2016-12-16 13:13:35 +01:00
DL6ER ec8c848106 Don't kill already existing setupVars.conf on update (and fresh install) 2016-12-16 12:53:00 +01:00
Mcat12 3b50ce8c54 Merge pull request #977 from pi-hole/activatewebUIpw 
Add password to webUI after update if there is none
 2016-12-15 14:05:11 -05:00
DL6ER afabb5957b Implement backend for https://github.com/pi-hole/AdminLTE/pull/253 2016-12-15 18:55:40 +01:00
DL6ER 1eeaa01234 Always put the information that we added a password if we did (not only on update but also on fresh install) 2016-12-15 15:22:44 +01:00
DL6ER e2898217d2 Made message shorter 2016-12-15 15:20:41 +01:00
DL6ER f81dadc5d0 Fix final message 2016-12-15 14:10:55 +01:00
Mcat12 a0019d86c5 Merge pull request #983 from pi-hole/cronpath 
Fix missing path information for cron
 2016-12-15 07:01:20 -05:00
DL6ER 3c4a9bba78 Minor change 2016-12-15 10:38:24 +01:00
Adam Warner 4348653431 Merge pull request #985 from pi-hole/pi.hole 
A man has no name. Even though his name is Jaqen H'ghar
 2016-12-15 08:49:22 +00:00
Dan Schaper 09cfa9bb20 Merge pull request #986 from pi-hole/autoCompletes 
add missing pihole autocomplete commands
 2016-12-14 12:58:50 -08:00
Promofaux e7713a9028 add missing pihole autocomplete commands 2016-12-14 19:53:40 +00:00
Promofaux 906a1753be specifically comment out gravity.list addn-host 2016-12-14 19:42:20 +00:00
Promofaux a3d519b671 no need to remove list, because of echo > 2016-12-14 19:33:15 +00:00
Promofaux 8591f9d576 check for list before removing it 2016-12-14 19:31:57 +00:00
Promofaux c10ec5548f remove code that replaces tokens in 01-pihole.conf 2016-12-14 19:29:44 +00:00
Promofaux 684ac98c8e Remove hostname and pi.hole entries, move to /etc/pihole/local.list 2016-12-14 19:28:01 +00:00
Promofaux db89fa9881 initial support for additional hosts file 2016-12-14 19:26:55 +00:00
Adam Warner 9a80421d73 Merge pull request #981 from pi-hole/quiet-dhcp 
Improvement of backend of web UI Settings page
 2016-12-14 19:11:49 +00:00
Mcat12 2ddacf40c0 Merge pull request #984 from pi-hole/Mcat12-auto-ipv6 
Automatically enable IPv6
 2016-12-14 13:59:55 -05:00
Mcat12 92f4824884 Automatically enable IPv6 2016-12-14 13:52:14 -05:00
DL6ER 9a2ffabc33 Fix missing path information 2016-12-14 17:33:20 +01:00
DL6ER 2977168da1 dnsmasq "bogus-priv" property 2016-12-14 16:16:25 +01:00
DL6ER 85e3f37503 dnsmasq "domain-needed" property 2016-12-14 16:09:57 +01:00