Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix queryFunc if adlists URLs have been removed #1618

Merged
merged 5 commits into from Jul 25, 2017

Conversation

Projects
None yet
3 participants
@WaLLy3K
Copy link
Collaborator

WaLLy3K commented Jul 18, 2017

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide.
  • I have checked that another pull request for this purpose does not exist.
  • I have considered, and confirmed that this submission will be valuable to others.
  • I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  • I give this submission freely, and claim no ownership to its content.

How familiar are you with the codebase?:

10


  • Allow for -adlists command line switch (where the "s" is a typo)
  • Add error message when unable to find associated adlists URL
Fix queryFunc if adlists URLs have been removed
* Allow for -adlists command line switch (where the "s" is a typo)
* Add error message when unable to find associated adlists URL
pihole Outdated
@@ -535,7 +541,6 @@ Switch Pi-hole subsystems to a different Github branch
Repositories:
core [branch] Change the branch of Pi-hole's core subsystem
web [branch] Change the branch of Admin Console subsystem
ftl [branch] Change the branch of Pi-hole's FTL subsystem

This comment has been minimized.

@Mcat12

Mcat12 Jul 18, 2017

Member

Why is this deleted?

This comment has been minimized.

@WaLLy3K

WaLLy3K Jul 18, 2017

Author Collaborator

Oh shoot, I edited my local pihole and not from the latest Development. I have no idea how I missed that 😅

pihole Outdated
@@ -429,15 +435,15 @@ Time:
# Enable Pi-hole
echo -e " ${INFO} Enabling blocking"
local str="Pi-hole Enabled"

This comment has been minimized.

@Mcat12

Mcat12 Jul 18, 2017

Member

Lots of extra whitespace

@WaLLy3K WaLLy3K changed the title Fix queryFunc if adlists URLs have been removed [WIP] Fix queryFunc if adlists URLs have been removed Jul 18, 2017

WaLLy3K added some commits Jul 18, 2017

@WaLLy3K WaLLy3K changed the title [WIP] Fix queryFunc if adlists URLs have been removed Fix queryFunc if adlists URLs have been removed Jul 18, 2017

@WaLLy3K WaLLy3K added this to the v3.2 milestone Jul 20, 2017

@PromoFaux

This comment has been minimized.

Copy link
Member

PromoFaux commented Jul 25, 2017

Approved

@PromoFaux PromoFaux merged commit e0eb5eb into development Jul 25, 2017

5 checks passed

codacy/pr Good work! A positive pull request.
Details
code-review/pullapprove Approved by PromoFaux, WaLLy3K
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
license/cla Contributor License Agreement is signed.
Details

@PromoFaux PromoFaux deleted the fix/qf-adlists branch Jul 25, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.