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

Add web frontend shutdown command #1572

Merged
merged 5 commits into from Sep 8, 2017

Conversation

Projects
None yet
5 participants
@PromoFaux
Copy link
Member

PromoFaux commented Jun 29, 2017

Allows us to continue work on #1378

gedetil and others added some commits Apr 11, 2017

Update webpage.sh
Implement "Halt system" button, next to "Restart system" button, on
admin/settings page.  Useful for doing clean shutdown before powering off.

(This affects 4 files, 3 for the web content, 1 for backend script.)

Gilbert Detillieux <gedetil> 2017-04-11
Merge branch 'development' of https://github.com/gedetil/pi-hole into…
… gedetil-development

Signed-off-by: Adam Warner <adamw@rner.email>

# Conflicts:
#	advanced/Scripts/webpage.sh

@PromoFaux PromoFaux changed the base branch from master to development Jun 29, 2017

@PromoFaux PromoFaux referenced this pull request Jun 29, 2017

Closed

Add web frontend shutdown command #1378

5 of 5 tasks complete

@PromoFaux PromoFaux changed the title Continuation of #1378 Add web frontend shutdown command Jun 29, 2017

@pi-hole pi-hole deleted a comment from CLAassistant Jun 29, 2017

@DL6ER

This comment has been minimized.

Copy link
Member

DL6ER commented Jul 3, 2017

I don't see to be able to get this branch

pi@raspberrypi:/etc/.pihole $ git checkout -b gedetil-development origin/gedetil-development
fatal: Cannot update paths and switch to branch 'gedetil-development' at the same time.
Did you intend to checkout 'origin/gedetil-development' which can not be resolved as commit?

@PromoFaux PromoFaux changed the title Add web frontend shutdown command [WIP] Add web frontend shutdown command Jul 15, 2017

@DL6ER

This comment has been minimized.

Copy link
Member

DL6ER commented Sep 8, 2017

@PromoFaux Why is this PR marked as [WIP] ?

@PromoFaux

This comment has been minimized.

Copy link
Member Author

PromoFaux commented Sep 8, 2017

Because you were going to work on it in lieu of the original submitter

DL6ER added some commits Sep 8, 2017

Merge branch 'development' into gedetil-development
Signed-off-by: DL6ER <dl6er@dl6er.de>

Conflicts:
	advanced/Scripts/webpage.sh
Use `poweroff` instead of `halt`
Signed-off-by: DL6ER <dl6er@dl6er.de>
Update to comply with current development code
Signed-off-by: DL6ER <dl6er@dl6er.de>

@DL6ER DL6ER changed the title [WIP] Add web frontend shutdown command Add web frontend shutdown command Sep 8, 2017

@Mcat12 Mcat12 added the Enhancement label Sep 8, 2017

@Mcat12

Mcat12 approved these changes Sep 8, 2017

@DL6ER DL6ER merged commit b8fedf7 into development Sep 8, 2017

5 checks passed

codacy/pr Good work! A positive pull request.
Details
code-review/pullapprove Approved by Mcat12, PromoFaux
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

@DL6ER DL6ER deleted the gedetil-development branch Sep 8, 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.