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 |
|
DL6ER
|
3c04dbb4ed
|
Update remote version at 17:59 as well as on reboot
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2017-12-21 12:33:08 +01:00 |
|
DL6ER
|
cfca367eef
|
Quickly verified in dnsmasq's source code: It has to be "trust-anchor" (with "-")
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2017-12-18 21:45:24 -05:00 |
|
DL6ER
|
8a243c5872
|
Insert also old trust anchor
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2017-12-18 21:45:15 -05:00 |
|
DL6ER
|
b30b3f3aeb
|
Update DNSSEC trust anchor
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
2017-12-18 21:44:34 -05:00 |
|
Adam Warner
|
2d3906450a
|
add back in str local var, and change ticks to info on whitelist lines
Signed-off-by: Adam Warner <adamw@rner.email>
|
2017-12-18 20:14:53 +00:00 |
|
Adam Warner
|
5ecc46d85b
|
Accidentally too many spaces
Signed-off-by: Adam Warner <adamw@rner.email>
|
2017-12-16 14:03:12 +00:00 |
|
Adam Warner
|
ddd6f3dbe5
|
Grammar changes. Lets not work out programmatically whether we need to pluralise a word. It's not needed.
Signed-off-by: Adam Warner <adamw@rner.email>
|
2017-12-16 13:55:52 +00:00 |
|
Adam Warner
|
f5237db580
|
Merge pull request #1849 from pi-hole/fix/1826
Remove quotes from the uniqDomains array to actually whitelist the so…
|
2017-12-16 13:22:44 +00:00 |
|
Adam Warner
|
761fd13a70
|
Remove quotes from the uniqDomains array to actually whitelist the sources
Signed-off-by: Adam Warner <adamw@rner.email>
|
2017-12-16 13:15:26 +00:00 |
|
Mark Drobnak
|
e3fa06d7ff
|
Merge pull request #1829 from keithbentrup/development
Must send HTTP headers before html
|
2017-12-13 13:37:32 -05:00 |
|
Mark Drobnak
|
61a76f4493
|
Merge pull request #1836 from pi-hole/tweak/packageInstall
Change package install notification from CROSS to INFO.
|
2017-12-13 12:27:47 -05:00 |
|
Adam Warner
|
c5f46702c8
|
Merge pull request #1840 from pi-hole/revert/GravityParseMethod
Revert parsing method to that of 3.1.4. New Method is allowing illega…
|
2017-12-12 17:49:36 +00:00 |
|
Adam Warner
|
c24e5cd3f6
|
:codacy: :codacy2: :codacy3:
Signed-off-by: Adam Warner <adamw@rner.email>
|
2017-12-12 12:45:25 +00:00 |
|
Adam Warner
|
cc3035267f
|
Revert parsing method to that of 3.1.4. New Method is allowing illegal lists through, and that is causing issues such as blocking www.google.com. This method will just throw away invalid list entries.
Signed-off-by: Adam Warner <adamw@rner.email>
|
2017-12-12 12:36:09 +00:00 |
|
Dan Schaper
|
29ee8250e9
|
Change package install notification from CROSS to TICK.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
|
2017-12-11 09:45:30 -08:00 |
|
Dan Schaper
|
47ed0b7627
|
Merge pull request #1830 from pi-hole/ops/stickler
Create .stickler.yml
|
2017-12-09 18:18:50 -08:00 |
|
Dan Schaper
|
423280cee1
|
Merge pull request #1817 from jjssoftware/development
pihole.log permissions
|
2017-12-09 14:15:12 -08:00 |
|
Dan Schaper
|
8c0faa0b9a
|
Create .stickler.yml
Initial stickler yaml file.
|
2017-12-09 14:08:54 -08:00 |
|
Keith Bentrup
|
45ab2a3d7a
|
send HTTP headers before HTML
Signed-off-by: Keith Bentrup <keith@keithbentrup.com>
|
2017-12-09 17:03:20 -05:00 |
|