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

Server path prefix #2152

Merged
merged 23 commits into from Nov 29, 2018

Conversation

Projects
None yet
4 participants
@connortechnology
Copy link
Member

connortechnology commented Jul 9, 2018

Add a PathPrefix option to the Server object so that each Server in a multi-server setup could have a different URL scheme. Defaults to /zm

@connortechnology

This comment has been minimized.

Copy link
Member

connortechnology commented Jul 9, 2018

I havn't used these changes in montage review yet.

@e7d

e7d approved these changes Aug 22, 2018

@pliablepixels

This comment has been minimized.

Copy link
Contributor

pliablepixels commented Oct 25, 2018

Tagging myself here as I need to incorporate these changes in zmN when this is merged
pliablepixels/zmNinja#724

@@ -118,13 +118,13 @@
echo "var maxScore=$maxScore;\n"; // used to skip frame load if we find no alarms.
} // end if initialmodeislive
echo "var Storage = [];\n";
echo "\nvar Storage = [];\n";

This comment has been minimized.

@knight-of-ni

knight-of-ni Nov 23, 2018

Member

The \n at the beginning there looks a bit odd. Just checking this is by design.

This comment has been minimized.

@connortechnology

connortechnology Nov 23, 2018

Member

Mostly there for readability of resulting javascript. separates logical sections with a new line.

@knight-of-ni knight-of-ni added this to the 1.32.3 milestone Nov 23, 2018

@knight-of-ni

This comment has been minimized.

Copy link
Member

knight-of-ni commented Nov 29, 2018

Preliminary testing is successful. Merging to get these change out to a wider audience....

@knight-of-ni knight-of-ni merged commit be07e44 into ZoneMinder:master Nov 29, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment