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

Implement new OTHER (offset) types for the long-term queries page #1680

Merged
merged 2 commits into from
Jan 15, 2021

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Jan 3, 2021

By submitting this pull request, I confirm the following:

  • 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)

What does this PR aim to accomplish?:

Implement new offset types for the long-term queries page. Also add the new SVCB and HTTPS tyes where they were forgotten.

How does this PR accomplish the above?:

Add new types and how to handle the offset. This PR accompanies pi-hole/FTL#1013

What documentation changes (if any) are needed to support this PR?:

None

…he new SVCB and HTTPS tyes where they were forgotten.

Signed-off-by: DL6ER <dl6er@dl6er.de>
PromoFaux
PromoFaux previously approved these changes Jan 13, 2021
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER
Copy link
Member Author

DL6ER commented Jan 15, 2021

Merged latest devel to resolve merge conflicts, needs re-approval

@DL6ER DL6ER merged commit b6f4202 into devel Jan 15, 2021
@DL6ER DL6ER deleted the new/OTHER_types branch January 15, 2021 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants