ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Isaac Connor 2021-11-29 14:15:10 -05:00
parent 089563d1ce 82a4cbaec5
commit 65dacbc317
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/zm_update-1.37.5.sql
View File

@ -7,7 +7,7 @@ SET @s = (SELECT IF(
FROM INFORMATION_SCHEMA.COLUMNS FROM INFORMATION_SCHEMA.COLUMNS
WHERE table_name = 'Monitors' WHERE table_name = 'Monitors'
AND table_schema = DATABASE() AND table_schema = DATABASE()
AND column_name = 'AlarmEndCommand' AND column_name = 'EventEndCommand'
) > 0, ) > 0,
"SELECT 'Column EventEndCommand already exists in Monitors'", "SELECT 'Column EventEndCommand already exists in Monitors'",
"ALTER TABLE `Monitors` ADD COLUMN `EventEndCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`" "ALTER TABLE `Monitors` ADD COLUMN `EventEndCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
@ -21,7 +21,7 @@ SET @s = (SELECT IF(
FROM INFORMATION_SCHEMA.COLUMNS FROM INFORMATION_SCHEMA.COLUMNS
WHERE table_name = 'Monitors' WHERE table_name = 'Monitors'
AND table_schema = DATABASE() AND table_schema = DATABASE()
AND column_name = 'AlarmStartCommand' AND column_name = 'EventStartCommand'
) > 0, ) > 0,
"SELECT 'Column EventStartCommand already exists in Monitors'", "SELECT 'Column EventStartCommand already exists in Monitors'",
"ALTER TABLE `Monitors` ADD COLUMN `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`" "ALTER TABLE `Monitors` ADD COLUMN `EventStartCommand` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"

4
docs/installationguide/debian.rst
View File

@ -4,7 +4,7 @@ Debian
.. contents:: .. contents::
Easy Way: Debian 11 (Bullseye) Easy Way: Debian 11 (Bullseye)
------------------------ ------------------------------
This procedure will guide you through the installation of ZoneMinder on Debian 11 (Bullseye). This procedure will guide you through the installation of ZoneMinder on Debian 11 (Bullseye).
@ -104,7 +104,7 @@ Add the following to the /etc/apt/sources.list.d/zoneminder.list file
You can do this using: You can do this using:
.. code-block:: ::
echo "deb https://zmrepo.zoneminder.com/debian/release-1.36 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list echo "deb https://zmrepo.zoneminder.com/debian/release-1.36 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list

7
src/zm_utils.cpp
View File

@ -252,8 +252,15 @@ void HwCapsDetect() {
#elif defined(__arm__) #elif defined(__arm__)
// ARM processor in 32bit mode // ARM processor in 32bit mode
// To see if it supports NEON, we need to get that information from the kernel // To see if it supports NEON, we need to get that information from the kernel
#ifdef __linux__
unsigned long auxval = getauxval(AT_HWCAP); unsigned long auxval = getauxval(AT_HWCAP);
if (auxval & HWCAP_ARM_NEON) { if (auxval & HWCAP_ARM_NEON) {
#elif defined(__FreeBSD__)
unsigned long auxval = 0;
elf_aux_info(AT_HWCAP, &auxval, sizeof(auxval));
if (auxval & HWCAP_NEON) {
#error Unsupported OS.
#endif
Debug(1,"Detected ARM (AArch32) processor with Neon"); Debug(1,"Detected ARM (AArch32) processor with Neon");
neonversion = 1; neonversion = 1;
} else { } else {

3
web/skins/classic/views/js/event.js
View File

@ -773,8 +773,9 @@ function manageDelConfirmModalBtns() {
return; return;
} }
pauseClicked();
evt.preventDefault(); evt.preventDefault();
$j.getJSON(thisUrl + '?request=event&task=delete&id='+eventData.Id) $j.getJSON(thisUrl + '?request=event&action=delete&id='+eventData.Id)
.done(function(data) { .done(function(data) {
$j('#deleteConfirm').modal('hide'); $j('#deleteConfirm').modal('hide');
streamNext(true); streamNext(true);