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
3446 commits 10 branches 109 tags 28 MiB
Commit graph

3446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stefan
f1b02c0cab Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 2018-01-12 21:21:26 +01:00
Stefan
828302702b Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 
Signed-off-by: Stefan <roots84@users.noreply.github.com>
 2018-01-12 21:20:39 +01:00
Stefan
0827d4fe40 Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1 2018-01-12 21:18:30 +01:00
Stefan
ebff965414 Update README.md 
Adding DNS-Swapper Project back after it was accidently removed

Signed-off-by: roots84 <stefan.bautz@gmail.com>
 2018-01-12 21:17:10 +01:00
Dan Schaper
b45954c560
Merge pull request #1895 from pi-hole/feature/PR_templateDCO 
Update PULL_REQUEST_TEMPLATE.md
 2018-01-12 08:14:51 -08:00
Adam Warner
80307a3bcd
Remove update line from cron 
Signed-off-by: Adam Warner <adamw@rner.email>
 2018-01-12 15:43:15 +00:00
Adam Warner
e8acb5967b
Merge pull request #1904 from vgerak/patch-1 
piholeDebug.sh: Correct typo mistake
 2018-01-12 15:04:27 +00:00
Vasilis Gerakaris
939806f021
piholeDebug.sh: Correct typo mistake 
Signed-off-by: Vasilis Gerakaris <vgerak@gmail.com>

**By submitting this pull request, I confirm the following:** 
`{please fill any appropriate checkboxes, e.g: [X]}`

- [x] I have read and understood the [contributors guide](https://github.com/pi-hole/pi-hole/blob/master/CONTRIBUTING.md), as well as this entire template.
- [x] I have made only one major change in my proposed changes.
- [] I have commented my proposed changes within the code.
- [] I have tested my proposed changes, and have included unit tests where possible.
- [] I am willing to help maintain this change if there are issues with it later.
- [x] I give this submission freely and claim no ownership.
- [x] It is compatible with the [EUPL 1.2 license](https://opensource.org/licenses/EUPL-1.1)
- [x] I have squashed any insignificant commits. ([`git rebase`](http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html))
 2018-01-12 02:17:31 +02:00
bcambl
cc47bf8f6c Fix epel-release install for CentOS 
Signed-off-by: bcambl <blayne@blaynecampbell.com>
 2018-01-07 22:21:04 -06:00
Stefan
8b80aaebf5
Update README.md 
Adding DNS-Swapper Project back after it was accidently removed
 2018-01-07 22:54:53 +01:00
DL6ER
8f35ebc0c2
Merge pull request #1897 from pi-hole/fix/webpage.sh_interface_setting 
Add fallback interface in DNS settings
 2018-01-07 16:56:01 +01:00
DL6ER
793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:36:03 +01:00
DL6ER
9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-07 14:34:02 +01:00
Dan Schaper
db62afbb64
Update PULL_REQUEST_TEMPLATE.md 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-01-06 07:28:26 -08:00
DL6ER
3dc3e8e40e
Merge pull request #1885 from pi-hole/new/FTL_Usocket 
Create directories /etc/{var,log}/pihole on startup of pihole-FTL
 2018-01-04 14:05:18 +01:00
Dan Schaper
c79fc81292
Merge pull request #1891 from pi-hole/feature/DCO_doc 
Link to DCO wiki entry.
 2018-01-03 16:31:06 -08:00
Dan Schaper
62a6a878d4
Link to DCO wiki entry. 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2018-01-03 16:20:57 -08:00
DL6ER
4efb533d2e
Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2018-01-01 11:26:03 +01:00
Mark Drobnak
891473c7fc
Merge pull request #1882 from pi-hole/tweak/jetbrains_codestyle 
Just ignore the whole .idea directory, execpt for the codeStyles
 2017-12-30 15:32:19 -05:00
Dan Schaper
81e8ef5c40
Just ignore the whole .idea directory, execpt for the codeStyles and the 
legacy codeStyelSettings.xml.

Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-12-30 12:23:46 -08:00
Mark Drobnak
e17885088b
Merge pull request #1881 from pi-hole/tweak/jetbrains_codestyle 
Jetbrains has moved codestyle locations. Development Internal
 2017-12-30 14:38:24 -05:00
Dan Schaper
494340fe67
Add other JetBrains stuff to ignore 2017-12-30 10:37:17 -08:00
Dan Schaper
01625dfd49
JetBrains new codestyle storage location 2017-12-30 10:33:41 -08:00
DL6ER
a154f1540f
Merge pull request #1778 from loganaden/development 
Add secondary quad9 server
 2017-12-30 18:19:55 +01:00
DL6ER
5254fc6efe
Merge pull request #1880 from pi-hole/fix/chronometer_localhost 
Small improvement for Chronometer
 2017-12-30 17:51:59 +01:00
DL6ER
afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1" 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-30 17:44:59 +01:00
DL6ER
a4c8f1a0a4
Merge pull request #1859 from pi-hole/new/extra-logging 
Enable dnsmasq's extra logging feature
 2017-12-28 22:49:43 +01:00
Mark Drobnak
d5a9a9a2d8
Merge pull request #1878 from pi-hole/tweak/run_updatechecker_after_install 
Force update of update checker for new installs
 2017-12-28 14:43:28 -05:00
DL6ER
3b8f8fb0ef
Merge pull request #1874 from pi-hole/uninitiate 
Grammar change in debug script
 2017-12-28 18:47:47 +01:00
DL6ER
677033afca
Force update of "remote" part in th update checker (may take up to 24hrs for new installs otherwise) 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-28 18:41:22 +01:00
Adam Warner
8e0d76b63b
initiated -> initialized 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-24 13:26:32 +00:00
Adam Warner
64df41ed90
Merge pull request #1873 from pi-hole/fix/1871 
Source setup vars before we attempt to do anything on an update/repair
 2017-12-24 13:21:45 +00:00
Adam Warner
442a372142
Merge pull request #1870 from pi-hole/docs/gitsignoff 
Add more informative link for Git Signoff
 2017-12-24 13:16:37 +00:00
Adam Warner
95e5baa967
Source setup vars before we attempt to do anything on an update/repair 
Signed-off-by: Adam Warner <adamw@rner.email>
 2017-12-24 13:09:45 +00:00
Dan Schaper
b80edfb996
Add more informative link for Git Signoff 
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
 2017-12-23 17:48:15 -08:00
Mark Drobnak
e06543bd17
Merge pull request #1866 from pi-hole/fix/FTL_branch_version_display 
Store fourth entry in versions/branches files
 2017-12-23 11:32:57 -05:00
DL6ER
cca8412921
Use "echo -n" to avoid haveing newlines in the files 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 11:52:27 +01:00
DL6ER
d15a5ad5c1
Add required documentation in the source code 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:46:51 +01:00
DL6ER
8ed75dd176
Add extra entry to the end of the saved branches and versions such that PHP's explode() subroutine can correctly disentangle the first three entries and does not get confused by the newline character at the end of the FTL version/branch... 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-23 00:42:41 +01:00
DL6ER
d43ad263ea
Merge pull request #1863 from pi-hole/master 
Sync with development branch
 2017-12-22 22:00:49 +01:00
Jacob Salmela
e602008459
Merge pull request #1856 from pi-hole/release/v3.2.1 
Pi-hole core v3.2.1
 2017-12-22 14:53:38 -06:00
Dan Schaper
322a18f0e6
Merge pull request #1861 from pi-hole/fix/DNSSEC_trustanchor 
Merge `fix/DNSSEC_trustanchor` into `release/3.2.1` again
 2017-12-21 11:03:05 -08:00
Dan Schaper
05eb749e66
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor 2017-12-21 11:00:21 -08:00
Dan Schaper
7e8d31a62c
Merge pull request #1860 from pi-hole/smarterNotHarder 
Merge `smarterNotHarder` into `release/3.2.1` again
 2017-12-21 10:59:55 -08:00
Dan Schaper
8ca0582afc
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor 2017-12-21 10:56:37 -08:00
Dan Schaper
b9f5fca546
Merge branch 'release/v3.2.1' into smarterNotHarder 2017-12-21 10:53:40 -08:00
DL6ER
5c2dcb5e74
Enable dnsmasq's extra logging feature 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 16:42:55 +01:00
DL6ER
3ef4af9326
Merge pull request #1857 from pi-hole/tweak/randomize_updatechecker 
Randomize update checker time
 2017-12-21 13:28:03 +01:00
DL6ER
f89f7ecd3e
Randomize GitHub API update check time 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 12:42:47 +01:00
DL6ER
be0c457445
Sleep 30 seconds after reboot to be sure that the system is ready 
Signed-off-by: DL6ER <dl6er@dl6er.de>
 2017-12-21 12:42:28 +01:00