Commit Graph

2999 Commits (b75dd5ff73e7a7898753d2cb851f42379a30b9f1)
 

Author SHA1 Message Date
Deathbybandaid b75dd5ff73
needed sign-off
7 years ago
Deathbybandaid 094bd49f35
Update README.md
7 years ago
Adam Warner 18fbe60381
Merge pull request #1908 from pi-hole/tweak/RemoveCronPiholeUpdate
7 years ago
Dan Schaper f4f77ec88b
Merge pull request #1900 from roots84/patch-1
7 years ago
Stefan 9ba2038702 Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1
7 years ago
Stefan b176ba9e80 Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1
7 years ago
Stefan cacb47ca7e Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1
7 years ago
Stefan 500e424fee Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1
7 years ago
Stefan f1b02c0cab Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1
7 years ago
Stefan 828302702b Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1
7 years ago
Stefan 0827d4fe40 Merge branch 'patch-1' of https://github.com/roots84/pi-hole into patch-1
7 years ago
Stefan ebff965414 Update README.md
7 years ago
Dan Schaper b45954c560
Merge pull request #1895 from pi-hole/feature/PR_templateDCO
7 years ago
Adam Warner 80307a3bcd
Remove update line from cron
7 years ago
Adam Warner e8acb5967b
Merge pull request #1904 from vgerak/patch-1
7 years ago
Vasilis Gerakaris 939806f021
piholeDebug.sh: Correct typo mistake
7 years ago
Stefan 8b80aaebf5
Update README.md
7 years ago
DL6ER 8f35ebc0c2
Merge pull request #1897 from pi-hole/fix/webpage.sh_interface_setting
7 years ago
DL6ER 793bdd9743
No need for cat | sed here as we source setupVars.conf, so we can use interface="${PIHOLE_INTERFACE}"
7 years ago
DL6ER 9d50f52bb2
Add fallback interface for DNS listening behavior in case PIHOLE_INTERFACE is not set in setupVars.conf
7 years ago
Dan Schaper db62afbb64
Update PULL_REQUEST_TEMPLATE.md
7 years ago
DL6ER 3dc3e8e40e
Merge pull request #1885 from pi-hole/new/FTL_Usocket
7 years ago
Dan Schaper c79fc81292
Merge pull request #1891 from pi-hole/feature/DCO_doc
7 years ago
Dan Schaper 62a6a878d4
Link to DCO wiki entry.
7 years ago
DL6ER 4efb533d2e
Create directories /etc/{var,log}/pihole on startup of pihole-FTL and set proper ownership
7 years ago
Mark Drobnak 891473c7fc
Merge pull request #1882 from pi-hole/tweak/jetbrains_codestyle
7 years ago
Dan Schaper 81e8ef5c40
Just ignore the whole .idea directory, execpt for the codeStyles and the
7 years ago
Mark Drobnak e17885088b
Merge pull request #1881 from pi-hole/tweak/jetbrains_codestyle
7 years ago
Dan Schaper 494340fe67
Add other JetBrains stuff to ignore
7 years ago
Dan Schaper 01625dfd49
JetBrains new codestyle storage location
7 years ago
DL6ER a154f1540f
Merge pull request #1778 from loganaden/development
7 years ago
DL6ER 5254fc6efe
Merge pull request #1880 from pi-hole/fix/chronometer_localhost
7 years ago
DL6ER afa2e9c2f7
Exchange hard-coded domain "localhost" by hard-coded address "127.0.0.1"
7 years ago
DL6ER a4c8f1a0a4
Merge pull request #1859 from pi-hole/new/extra-logging
7 years ago
Mark Drobnak d5a9a9a2d8
Merge pull request #1878 from pi-hole/tweak/run_updatechecker_after_install
7 years ago
DL6ER 3b8f8fb0ef
Merge pull request #1874 from pi-hole/uninitiate
7 years ago
DL6ER 677033afca
Force update of "remote" part in th update checker (may take up to 24hrs for new installs otherwise)
7 years ago
Adam Warner 8e0d76b63b
initiated -> initialized
7 years ago
Adam Warner 64df41ed90
Merge pull request #1873 from pi-hole/fix/1871
7 years ago
Adam Warner 442a372142
Merge pull request #1870 from pi-hole/docs/gitsignoff
7 years ago
Adam Warner 95e5baa967
Source setup vars before we attempt to do anything on an update/repair
7 years ago
Dan Schaper b80edfb996
Add more informative link for Git Signoff
7 years ago
Mark Drobnak e06543bd17
Merge pull request #1866 from pi-hole/fix/FTL_branch_version_display
7 years ago
DL6ER cca8412921
Use "echo -n" to avoid haveing newlines in the files
7 years ago
DL6ER d15a5ad5c1
Add required documentation in the source code
7 years ago
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...
7 years ago
DL6ER d43ad263ea
Merge pull request #1863 from pi-hole/master
7 years ago
Jacob Salmela e602008459
Merge pull request #1856 from pi-hole/release/v3.2.1
7 years ago
Dan Schaper 322a18f0e6
Merge pull request #1861 from pi-hole/fix/DNSSEC_trustanchor
7 years ago
Dan Schaper 05eb749e66
Merge branch 'release/v3.2.1' into fix/DNSSEC_trustanchor
7 years ago