ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/zoneminder

pull/3988/head
Isaac Connor 2024-05-08 14:33:00 -04:00
parent 05bdfdbe9a 399bc7e6e0
commit 74bc714720
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/do_debian_package.sh
View File

@ -142,7 +142,7 @@ if [ "$SNAPSHOT" == "stable" ]; then
BRANCH=`git describe --tags $(git rev-list --tags --max-count=1)`;
if [ -z "$BRANCH" ]; then
# This should only happen in CI environments where tag info isn't available
BRANCH=$(cat "$(find . -name 'version' -o -name 'version.txt')")
BRANCH=$(cat "$(find . -maxdepth 1 -name 'version' -o -name 'version.txt')")
echo "Building branch $BRANCH"
fi
if [ "$BRANCH" == "" ]; then
@ -180,7 +180,7 @@ fi;
echo "git pull..."
git pull
# Grab the ZoneMinder version from the contents of the version file
VERSION=$(cat "$(find . -name 'version' -o -name 'version.txt')")
VERSION=$(cat "$(find . -maxdepth 1 -name 'version' -o -name 'version.txt')")
if [ -z "$VERSION" ]; then
exit 1;
fi;

4
web/skins/classic/css/base/skin.css
View File

@ -936,6 +936,10 @@ a.flip {
clear: both;
}
.monitor .monitorStatus.bottom {
color: #dddddd;
}
.monitor.idle img {
border: 2px solid #ffffff;
}