Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-27 07:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
2406 commits 10 branches 109 tags 28 MiB
Commit graph

2406 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Schaper
642a73508d Merge pull request #1119 from pi-hole/tweak/dry_installer 
Repetitive `ip route get` was resetting counts.
 2017-01-08 20:43:40 -08:00
Dan Schaper
8f7b023769
Shellcheck for Test for $? -eq 0 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-08 18:48:54 -08:00
Dan Schaper
a122fb2900
Shellcheck for Test for $? -eq 0 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-08 18:46:15 -08:00
Dan Schaper
a299a2cc5f
Repetitive ip route get was resetting counts. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-08 18:04:24 -08:00
Adam Warner
47196d86ad Merge pull request #1115 from pi-hole/development 
[RELEASE] Pi-hole Core 2.11.2
 2017-01-08 23:22:26 +00:00
Mcat12
a713cf7952 Merge pull request #1116 from pi-hole/fix/multi_interface 
Fix/multi interface
 2017-01-08 17:57:29 -05:00
Dan Schaper
6cd7b8ff5e Merge branch 'master' into fix/multi_interface 2017-01-08 14:54:46 -08:00
Dan Schaper
f8264f8277
Merge branch 'development' of github.com:pi-hole/pi-hole into development 2017-01-08 14:49:29 -08:00
Dan Schaper
0e4d5e9103
Bash splitting and globin 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-08 14:49:08 -08:00
trick77
f599bcfef9 Bugfix if multiple interfaces are present 2017-01-08 13:56:08 +01:00
DL6ER
74a4e62cc9
Codacy fix 2017-01-08 11:26:56 +01:00
DL6ER
63a414a544
Align outputs 2017-01-08 11:21:50 +01:00
DL6ER
7d1f5091a7
Fixed small typo 2017-01-08 11:21:10 +01:00
DL6ER
3b54cab3bc
Show branches and revisions (incl. possible dirty state) in debug log 2017-01-08 11:17:25 +01:00
trick77
52d06d906e Bugfix if multiple interfaces are present 2017-01-08 10:14:40 +01:00
DL6ER
d9e949b27c Merge pull request #1096 from pi-hole/fix/updater 
Fix updater failing on non-English systems
 2017-01-06 23:36:42 +01:00
DL6ER
b65fe9d64f Merge pull request #1099 from pi-hole/fix/webpageshtypo 
Fixed typo in webpage.sh
 2017-01-05 21:57:00 +01:00
DL6ER
168397e90d
Fixed typo in webpage.sh 2017-01-05 21:45:06 +01:00
DL6ER
e3c1fcd2c6
NEW LOGIC FOR THE UPDATER 
Compare local and remote hashes. Update is available if current remote hash is different from current local hash since we assume that local should never be newer than remote for user
 2017-01-05 13:10:19 +01:00
Dan Schaper
a2bc86fbcb Merge pull request #1085 from pi-hole/development 
[RELEASE] Pi-hole Core 2.11.1
 2017-01-04 12:30:29 -08:00
Dan Schaper
26c6446252
Merge branch 'master' into development 2017-01-04 12:29:42 -08:00
Dan Schaper
e5e44db5ac
Merge branches 'development' and 'master' of github.com:pi-hole/pi-hole into development 2017-01-04 12:26:34 -08:00
DL6ER
d4f833c739 Merge pull request #1090 from pi-hole/fix/dead-led-link 
replace dead link to another LED blink project page
 2017-01-04 16:19:32 +01:00
Jacob Salmela
806f44abe6
replace dead link to another LED blink project page 2017-01-04 09:01:03 -06:00
Mcat12
900bdc5ee2 Merge pull request #1083 from pi-hole/fix/DHCP 
Improvements to DHCP settings
 2017-01-03 17:06:17 -05:00
DL6ER
200995bf29
Make IPv6 features of Pi-hole DHCP server switchable 2017-01-03 14:24:33 +01:00
DL6ER
3a90c1c192
Source setupVars.conf before trying to access variables 2017-01-03 13:34:01 +01:00
Dan Schaper
cc68155dfa
Merge remote-tracking branch 'origin/master' 2017-01-02 14:12:30 -08:00
Mcat12
b8545eb1df Merge pull request #1074 from pi-hole/development 
[RELEASE] Pi-hole Core 2.11
 2017-01-02 16:36:55 -05:00
Mcat12
76531da340 Merge pull request #1067 from pi-hole/fix/firewall_redux 
Fix/firewall redux
 2017-01-02 11:36:38 -05:00
Adam Warner
12bec1df68 Merge pull request #1048 from pi-hole/tweak/simplify_webpage.sh 
Major simplification of webpage.sh + extend DHCP to IPv6
 2017-01-02 14:28:26 +00:00
DL6ER
2b778695b1
Implement querying ad lists support for wildcards (what hell of a bash experience) 2017-01-02 14:27:13 +01:00
DL6ER
ad61852804
Test against empty string 2017-01-02 11:10:38 +01:00
DL6ER
dbd8aee4ee
Add 'local' domain if not set in setupVers.conf 2017-01-02 11:08:54 +01:00
DL6ER
677694b01a
Set 24h lease time if settings was empty before 2017-01-02 11:05:40 +01:00
DL6ER
85f0241c0d
Reprocess DHCP settings after update 2017-01-02 10:50:59 +01:00
Dan Schaper
ade2185a9f Merge pull request #1073 from pi-hole/tweak/quidsup 
Comment out QuidsUp
 2017-01-01 15:35:55 -08:00
Dan Schaper
0d27005dda
Comment out QuidsUp 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 15:31:17 -08:00
Dan Schaper
8ee2bdec4d
Plain grep, escape the special characters. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 14:38:10 -08:00
Dan Schaper
de6ce276d0
Merge branch 'development' of github.com:pi-hole/pi-hole into fix/firewall_redux 2017-01-01 14:13:32 -08:00
Dan Schaper
fbea81dcd7 Merge pull request #1068 from pi-hole/fix/anti_glob 
Misc tweaks to the installer script. Defensive git cloning, and ability to source the installer script.
 2017-01-01 14:10:55 -08:00
Dan Schaper
502c349b8b
Merge branches 'development' and 'fix/firewall_redux' of github.com:pi-hole/pi-hole into fix/firewall_redux 2017-01-01 13:47:56 -08:00
Adam Warner
5fb0aa70de Merge pull request #1008 from pi-hole/feature/track_pre-installed_packages 
Feature/track pre installed packages
 2017-01-01 20:29:02 +00:00
Dan Schaper
7750e1344c
DRY displayFinalMessage 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 07:10:14 -08:00
Dan Schaper
8be37130e9
Move first check to main(), basic-install.sh can now be sourced. 
Set `PH_TEST=true` then `source basic-install.sh`. Careful for `set -e`.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 06:45:03 -08:00
Dan Schaper
fa055481a7
Shellcheck screen size 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 06:32:49 -08:00
Dan Schaper
d080e5d7a8
Merge branch 'fix/anti_glob' of github.com:pi-hole/pi-hole into fix/anti_glob 2017-01-01 00:18:37 -08:00
Dan Schaper
ad07655630
Defensive git cloning 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 00:14:12 -08:00
Dan Schaper
7cceb8615a
make_repo more defensive. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 00:13:51 -08:00
Dan Schaper
ab9c8f4859
make_repo more defensive. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-01-01 00:00:48 -08:00