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

updated fork #1

Merged
merged 66 commits into from
Jun 11, 2019
Merged

updated fork #1

merged 66 commits into from
Jun 11, 2019

Conversation

advir29
Copy link
Owner

@advir29 advir29 commented Jun 11, 2019

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

  • I have read and understood the contributors guide, as well as this entire template.
  • 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.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

Please make sure you Sign Off all commits. Pi-hole enforces the DCO.


What does this PR aim to accomplish?:
A detailed description, screenshots (if necessary), as well as links to any relevant GitHub issues

How does this PR accomplish the above?:
A detailed description (such as a changelog) and screenshots (if necessary) of the implemented fix

What documentation changes (if any) are needed to support this PR?:
A detailed list of any necessary changes


  • You must follow the template instructions. Failure to do so will result in your pull request being closed.
  • Please respect that Pi-hole is developed by volunteers, who can only reply in their spare time.

DL6ER and others added 30 commits January 9, 2019 19:26
…ew FTL binary. Users who want to update the database more frequently than on each FTL release can use the python script from the FTL repository to generate the database themselves. The macvendor database is an optional component so a failing download is no reason to interrupt the installer.

Signed-off-by: DL6ER <[email protected]>
…-list

Standardize DNS list and write to file for AdminLTE
Signed-off-by: Mark Drobnak <[email protected]>
…pper for the overall install process.

Signed-off-by: DL6ER <[email protected]>
# Conflicts:
#	automated install/basic-install.sh
Only a user has been created beforehand. Only some distributions create
a group with the same name based on their configuration. We cannot
assume this is always the default.

Signed-off-by: Andreas Schneider <[email protected]>
A bunch of fixes for basic-install.sh
No protocol determination is neede, if you just use double slash.

Signed-off-by: Nils Bergmann <[email protected]>
Update development from hotfix/v4.2.2
If output of `git status -s` is non-null display changes
if output of `git diff` is non-null, display diff

Signed-off-by: Adam Warner <[email protected]>
log file. We want ansi color codes to be sent.

Signed-off-by: Dan Schaper <[email protected]>
Use `curl` instead of `openssl` for debug upload.
Changed badges from HTML code to markdown for consistency

Signed-off-by: Mpho Mphego <[email protected]>
Removed the extra double quote.

Signed-off-by: Mpho Mphego <[email protected]>
Warn user during update if FTL is on a custom branch
PromoFaux and others added 29 commits March 29, 2019 00:08
Add Check to `pihole -q -exact` to ensure there is no `#` char preceding a space before the domain
Add a link to the documentation on FTL privacy levels during install
`-r` worked, but `--refresh` did not.

Fixes #2703

Signed-off-by: Mcat12 <[email protected]>
Fixes the typo in update_package_cache(), where the error message
 contained the color code twice, instead of the $UPDATE_PKG_CACHE text.

Signed-off-by: Jan Piskvor Martinec <[email protected]>
Show $UPDATE_PKG_CACHE content in error message.
It is already checked, but this make the code explicit.

Signed-off-by: Mcat12 <[email protected]>
Fix getting IP address in the presence of similar subnets
Fix chronometer refresh incorrectly reading the long argument sleep time
We no longer have access to the old coinbase account. Updating to new Coinbase Commerce account.
Fix tricorder upload function calls to use new curl function.
hosts-file.net was hard-coded as the domain to check instead of the
actual domain.

Signed-off-by: Mcat12 <[email protected]>
Fix incorrect adlist query when an adlist is blocked during gravity
… ensures that we clone at least one tagged commit in case we need to push changes to master.

Signed-off-by: DL6ER <[email protected]>
Change StickerMule reflink to Team Pi-hole link.
Pi-hole Debug - tricorder upload function calls
Fix to prevent "fatal: No names found, cannot describe anything" git message during scheduled update checks

Signed-off-by: DL6ER <[email protected]>
Fix for preventing git error message in cron logs
@advir29 advir29 merged commit f9ecf3a into advir29:master Jun 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.