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.

Sign up for GitHub

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

Jump to bottom

network.js: use utils.datetime() #1452

Merged
merged 1 commit into from
Jun 7, 2020
Merged

network.js: use utils.datetime() #1452

merged 1 commit into from
Jun 7, 2020

Conversation

XhmikosR
Copy link
Contributor

@XhmikosR XhmikosR commented Jun 7, 2020 •
edited
Loading

Signed-off-by: XhmikosR [email protected]

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

{Please ensure that your pull request is for the 'devel' branch!}

  • 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.
  • 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)
  • I have Signed Off all commits. (git commit --signoff)

@XhmikosR XhmikosR added this to the v5.1 milestone Jun 7, 2020
@XhmikosR XhmikosR requested review from PromoFaux and DL6ER June 7, 2020 14:02
@XhmikosR XhmikosR changed the title network.js: use utils.datetime() network.js: use utils.datetime() Jun 7, 2020
@XhmikosR XhmikosR force-pushed the XhmikosR-patch-1 branch from 9e9cb57 to 7bfc7cb Compare June 7, 2020 14:03
DL6ER
DL6ER approved these changes Jun 7, 2020
View reviewed changes
Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function in utils is not exactly identical, but this doesn't mater here.

https://github.com/pi-hole/AdminLTE/blob/1bef0bb17bfcdfa36385c203897c7e4b8a333ea7/scripts/pi-hole/js/utils.js#L108

@DL6ER DL6ER merged commit d5de840 into devel Jun 7, 2020
@DL6ER DL6ER deleted the XhmikosR-patch-1 branch June 7, 2020 15:11
@PromoFaux PromoFaux mentioned this pull request Jul 5, 2020
Merged
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-5-1-released/35577/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DL6ER DL6ER DL6ER approved these changes

@PromoFaux PromoFaux Awaiting requested review from PromoFaux

Assignees
No one assigned
Labels
Code maintenance
Projects
None yet
Milestone
v5.1
Development

Successfully merging this pull request may close these issues.
3 participants
@XhmikosR @pralor-bot @DL6ER