Commit graph

3433 commits

Author SHA1 Message Date
Mark Drobnak
47b56d6123
Fix wrong git command flag
I could not find documentation on a `--head` flag, but there is a `--heads` flag which does the same thing.

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-27 23:27:44 -04:00
Dan Schaper
a44096a26d
Merge pull request #2303 from pi-hole/development
Update release/v4.0 with latest development changes
2018-07-26 22:30:51 -07:00
Dan Schaper
32cf94fc74
Merge pull request #2297 from pi-hole/bugfix/locales
Fixed locale issue, do not parse for string.
2018-07-26 16:44:52 -07:00
Dan Schaper
39e28cd80a
Merge pull request #2302 from pi-hole/revert/2282
Revert #2282
2018-07-26 16:38:44 -07:00
Adam Warner
9b1356ad01
Revert #2282
Signed-off-by: Adam Warner <adamw@rner.email>
2018-07-27 00:27:06 +01:00
Dan Schaper
46a366635c
Fixed locale issue, do not parse for string.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-26 05:30:05 -07:00
Dan Schaper
384b588a2d
Merge pull request #2291 from pi-hole/merge/FTLDNS-to-development
Fix merge conflict in #2276
2018-07-24 11:51:56 -07:00
Mcat12
03e5a78d8f
Merge remote-tracking branch 'origin/FTLDNS' into development
# Conflicts:
#	advanced/Scripts/piholeDebug.sh
2018-07-22 15:18:26 -04:00
Dan Schaper
e32c76b059
Merge pull request #2289 from pi-hole/feature/space_tab
Adjusting spacing for utility scripts.
2018-07-20 19:23:50 -07:00
Dan Schaper
ba7782f867
Space/Tab piholeDebug.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 15:25:35 -07:00
Dan Schaper
c5091b0e49
Space/Tab wildcard_regex_converter.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 14:00:34 -07:00
Dan Schaper
b54e32f0ca
Space/Tab webpage.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:57:15 -07:00
Dan Schaper
328e7738d5
Space/Tab version.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:27:30 -07:00
Dan Schaper
aca359c2e2
Space/Tab updatecheck.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:24:05 -07:00
Dan Schaper
1cd40dc9e5
Space/Tab update.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:22:37 -07:00
Dan Schaper
dc9407281f
Space/Tab setupLCD.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:17:10 -07:00
Dan Schaper
8f727c1f35
Space/Tab query.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:13:42 -07:00
Dan Schaper
a08ea28feb
Space/Tab piholeLogFlush.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 13:07:54 -07:00
Dan Schaper
c5535dd9a0
Space/Tab piholeCheckout.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 12:54:24 -07:00
Dan Schaper
3519cc5e44
Space/Tab list.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 12:42:11 -07:00
Dan Schaper
d251bbbb05
Space/Tab chronometer.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 12:29:09 -07:00
Dan Schaper
1fc3ec9029
Merge pull request #2287 from pi-hole/feature/clean_comments
Remove empty comment lines in basic-install.sh
2018-07-20 11:37:15 -07:00
Dan Schaper
1877128fc4
Removes empty comment lines in basic-install.sh
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-20 10:38:13 -07:00
Dan Schaper
76c5b4a06b
Merge pull request #2118 from pi-hole/fix/debug-shellcheck
fix some shellcheck/stickler compaints in debug script
2018-07-19 05:18:40 -07:00
Mark Drobnak
9cd674b528
Merge pull request #2282 from RamSet/tweak/Port53
Updated port 53 check #2
2018-07-18 22:56:33 -04:00
RamSet
5aea7eb860 corrected function indentation
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 20:46:18 -06:00
Mark Drobnak
ec30df2020
Merge pull request #2277 from bcambl/centos_fedora_fixes
Installer fixes for Fedora & CentOS
2018-07-17 22:06:25 -04:00
RamSet
bb33427c79 fixed parsing error
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 18:09:25 -06:00
RamSet
28a16cebda Addressed lint errors.
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 18:06:32 -06:00
RamSet
49c79405bc changed flag and variable name
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 18:04:50 -06:00
RamSet
3098f32a07 Fixed intentation and corrected comments.
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-17 17:56:13 -06:00
Dan Schaper
b1e9c05bee
Merge pull request #2284 from pi-hole/bugfix/source_webpage
Added missing `.` for sourced file.
2018-07-17 06:38:32 -07:00
Dan Schaper
69e06d89ff
Added missing for sourced file.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
2018-07-16 22:36:58 -07:00
RamSet
56b04017e7 Port 53 check updated with 4 spaces.
Signed-off-by: RamSet <RamSet@gmail.com>
2018-07-16 11:29:12 -06:00
RamSet
3af61c031d
Merge pull request #1 from pi-hole/development
Development
2018-07-16 11:20:49 -06:00
Dan Schaper
f42a57088f
Merge pull request #2280 from rrobgill/development
Add regex option to autocomplete
2018-07-16 09:34:22 -07:00
WaLLy3K
4834452875
Merge pull request #2278 from pi-hole/fix/missing-wildlist-help-and-double-dash
Add back --wild list.sh help and use -- for long params like --regex
2018-07-16 14:55:05 +10:00
Rob Gill
c5b9d99b48 Add regex option to autocomplete
Signed-off-by: Rob Gill <rrobgill@protonmail.com>
2018-07-16 10:50:05 +10:00
Mcat12
f8d4c36f6d
Add back --wild list.sh help and use -- for long params like --regex
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-15 18:59:25 -04:00
bcambl
fa9ecbdb81 add php-json to Fedora web deps
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-07-15 15:41:04 -06:00
bcambl
2bf6b29b8f trigger an install/upgrade of PHP after enabling the Remi repository
Signed-off-by: bcambl <blayne@blaynecampbell.com>
2018-07-15 15:40:44 -06:00
Dan Schaper
25812f88f6
Merge pull request #2262 from bcambl/additional_tests
additonal test coverage for installer
2018-07-15 09:03:52 -07:00
Dan Schaper
037989b8e4
Merge pull request #2271 from pi-hole/feature/installer_spacing
Start changes to new code style for repository. Revise basic installer.sh spacing.
2018-07-14 19:55:13 -07:00
Dan Schaper
dbc82cfb6a
Merge pull request #2236 from pi-hole/new/regex-lists
Use regex lists instead of wildcards for blocking
2018-07-14 06:10:44 -07:00
Mcat12
941a766aa3
Replace -wild and -regex with --wild and --regex
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-12 21:38:43 -04:00
Mcat12
72be7ad5f0
Don't count commented out regex lines
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-12 21:21:06 -04:00
Mcat12
b2a36f71a0
Fix wildcard description in pihole man page
Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
2018-07-12 21:17:32 -04:00
Adam Hill
6b17620389
Update .travis.yml 2018-07-12 10:24:01 -05:00
Adam Hill
b04195041a
Update README.md 2018-07-12 10:22:50 -05:00
Adam Hill
8ca4c66e3c
make smarter assertions rathe than largestring not in string
Signed-off-by: Adam Hill <adam@diginc.us>
2018-07-12 00:03:25 -05:00