6e57c55db6
Move response_code down in scope, log curl_error value if not ok.
2024-10-18 18:39:08 -04:00
b50ef69629
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-16 18:45:51 -04:00
88692cf04f
COde style, cleanups, remove STATE_TAPE
2024-10-16 18:45:10 -04:00
b236b48f1b
Updates removing zma and fixing some of the perl module names
2024-10-16 11:42:55 -04:00
123c261e75
Fix eslint
2024-10-15 18:16:55 -04:00
c2fe3ce1e8
Fix eslint
2024-10-15 18:10:05 -04:00
038bf5c07e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-15 17:58:48 -04:00
65fd598bb7
Upgrade jwt-cpp to 0.7.0
2024-10-15 17:41:48 -04:00
75cd5e6166
Merge pull request #4175 from 0xB0D/master+gsoap-link-fix
...
Fix libgsoap linking in src/CMakeLists.txt
2024-10-13 12:01:29 -04:00
f43d048641
Fix libgsoap linking in src/CMakeLists.txt
...
libgsoap supplies both libgsoap++.a and libgsoapssl++.a however an
application should link to one of those libraries not both.
An example from gsoap-2.8 samples:
With SSL:
/usr/bin/clang++ -DLINUX -g -O2 -o json-GitHub json_GitHub-json-GitHub.o json_GitHub-xml-rpc.o json_GitHub-json.o json_GitHub-soapC.o ../../../gsoap/libgsoapssl++.a -lm -lssl -lcrypto -lz
Without SSL:
/usr/bin/clang++ -DLINUX -g -O2 -o json-currentTimeServer json-currentTimeServer.o xml-rpc.o json.o soapC.o ../../../gsoap/libgsoap++.a -lm -lpthread
Right now src/CMakeLists.txt is try to link to both libgsoap++ and
libgsoapssl++.
/usr/bin/ld: /lib/libgsoapssl++.a(libgsoapssl___a-stdsoap2_ssl_cpp.o): in function `soap_query':
(.text+0x1880): multiple definition of `soap_query'; /lib/libgsoap++.a(libgsoap___a-stdsoap2_cpp.o):(.text+0x1890): first defined here
/usr/bin/ld: /lib/libgsoapssl++.a(libgsoapssl___a-stdsoap2_ssl_cpp.o): in function `soap_query_decode':
(.text+0x18a0): multiple definition of `soap_query_decode'; /lib/libgsoap++.a(libgsoap___a-stdsoap2_cpp.o):(.text+0x18b0): first defined here
/usr/bin/ld: /lib/libgsoapssl++.a(libgsoapssl___a-stdsoap2_ssl_cpp.o): in function `soap_query_key':
(.text+0x1a50): multiple definition of `soap_query_key'; /lib/libgsoap++.a(libgsoap___a-stdsoap2_cpp.o):(.text+0x1a60): first defined here
Change src/CMakeLists.txt so that
1. libgsoap++ is the default library to link
2. libgsoapssl++ is linked to instead if HAVE_OPENSSL is true
This means that if openssl is not detected libgsoap++ will be linked
otherwise libgsoapssl++ will be linked.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@nexus-software.ie>
2024-10-13 14:12:55 +01:00
2be8cf7e63
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-10 13:56:23 -04:00
f1a72c909d
Merge pull request #4171 from IgorA100/patch-438287
...
Fix: incorrect placement of brackets (event.php)
2024-10-10 13:52:33 -04:00
8e2bbd57c5
Merge pull request #4172 from IgorA100/patch-406680
...
Fix: Specify 'mode'=>'mp4' for getStreamSrc() Otherwise video.js sometimes cannot determine that it is a file recording that is being played, and not a direct viewing. on Event page
2024-10-10 13:51:00 -04:00
a745c61aef
Merge pull request #4173 from IgorA100/patch-253092
...
Fix: Increase z-index to 20 for buttons ".btn-zoom-in & .btn-zoom-out" (skin.css)
2024-10-10 13:10:55 -04:00
0019857f11
Die with semi-useful log message if failed to create x10
2024-10-10 12:21:37 -04:00
e4fa3e9e12
Increase z-index to 20 for buttons ".btn-zoom-in & .btn-zoom-out" (skin.css)
...
Otherwise, the ".block-button-center" block partially overlaps with other buttons.
2024-10-10 16:24:14 +03:00
a0398dd2d7
Merge pull request #4170 from 0xB0D/master+alarms-fix
...
Fix alarms() out of scope
2024-10-08 15:33:28 -04:00
fb19016564
Fix: Specify 'mode'=>'mp4' for getStreamSrc() Otherwise video.js sometimes cannot determine that it is a file recording that is being played, and not a direct viewing. (event.php)
2024-10-08 19:58:14 +03:00
4d38ecd06e
Fix: incorrect placement of brackets (event.php)
...
Because of this it is not possible to switch to the "Codec = MGPEG" mode
The error appeared here: 2229e880b1
2024-10-08 19:49:25 +03:00
1136ef9ebe
Fix alarms() out of scope
...
The string alarms() is only valid when the define WITH_GSOAP is present.
Fixes: a0a95d887c
2024-10-08 11:51:29 +01:00
a0a95d887c
Don't crash when alarms is empty
2024-10-06 11:07:10 -04:00
6e1e077a90
If shm size is 0 don't log an error
2024-10-04 14:35:06 -04:00
3d3ece315b
Code style and spacing
2024-10-04 14:34:42 -04:00
f9f2d0cdd1
Fix some spaces
2024-10-04 12:22:24 -04:00
be946e959b
Merge pull request #4167 from BHMSD-bdailey/ONVIFNotes
...
Onvif notes from Alarms map
2024-10-03 14:54:33 -04:00
abd3097af3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-03 14:42:57 -04:00
d2514b5e83
a while is better than a for
2024-10-03 14:42:51 -04:00
6159a74d41
Clean up unneeded code
2024-10-03 11:59:08 -04:00
326995d810
Working implementation from Alarms map so that rollover events contain the currently still enabled topics not just the last topic.
2024-10-03 10:33:55 -04:00
e306dcf972
Merge pull request #4163 from IgorA100/patch-180200
...
Chore: Removed the use of the "delay" constant as it is no longer used when starting monitors on the Montage page
2024-10-03 06:51:14 -04:00
02dc5ccbb4
Merge pull request #4166 from IgorA100/patch-335384
...
Fix: Declared variable "h" on Event page
2024-10-03 06:50:41 -04:00
5ae6e0e846
Declared variable "h" (event.js)
...
Closed: https://forums.zoneminder.com/viewtopic.php?p=135715&sid=593ae02225002db4f98a48b0ae3e8e18#p135715
2024-10-03 11:56:53 +03:00
daffe0294b
Add ONVIF as a Notes filter
2024-10-02 16:16:53 -04:00
87e0a092b7
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-10-02 14:23:10 -04:00
b89d404181
Update bootstrap-table to 1.23.5
2024-10-02 14:23:03 -04:00
8cd7e872f3
Set option help color to be the same as buttons
2024-10-02 14:22:14 -04:00
18d5c88c64
Update montage.js
2024-10-02 19:41:07 +03:00
5b02594928
Removed usage of "delay" constant as it is no longer used (montage.js)
2024-10-02 19:39:49 +03:00
5790a0d03b
Recovered spaces that I accidentally deleted (MonitorStream.js)
2024-10-02 19:35:54 +03:00
701d485773
Removed the "delay" argument from the "start" function as it is no longer used (MonitorStream.js)
2024-10-02 19:33:37 +03:00
a961471c70
Merge pull request #4165 from BHMSD-bdailey/ONVIFNotes
...
Update the way that ONVIF Notes are returned so they are more accurate for events that rollover from section length.
2024-10-02 10:37:21 -04:00
19014977e3
No functional change working as previoius via a function.
2024-10-02 10:30:23 -04:00
f56d001839
Merge pull request #4164 from IgorA100/patch-732743
...
Fix: Scaling of control buttons (Zoom, Edit, etc.) located on the Stream depending on the width of the Stream on Event page witch use video.js
2024-10-02 09:30:58 -04:00
bc1a7af1fc
Add analysing to monitor status stream
2024-10-02 09:30:03 -04:00
95874af1a9
Fix: Scaling of control buttons (Zoom, Edit, etc.) located on the Stream depending on the width of the Stream on Event page witch use video.js (skin.js)
...
Fix to https://github.com/ZoneMinder/zoneminder/pull/4121/files
2024-10-02 15:16:18 +03:00
8843d8c18a
Fix: Restored monitors start with delay (MonitorStream.js)
...
Probably it broke at some point. Or maybe it never worked, but in montage.js monitors start with a delay:
"monitor.start(delay);"
2024-10-02 13:37:05 +03:00
19ea7339f4
set monitorStream gridstack
2024-10-01 17:23:03 -04:00
9555455c5d
Add defines for ANALYSING_NONE and ANALYSING_ALWAYS
2024-10-01 17:14:01 -04:00
35f2dee620
add setGridStack. Rework logic on enable/disable motion anf force/cancel alarm to match when using rtsp2web. Add support for score and analysing in status response.
2024-10-01 17:13:30 -04:00
4f03ce362d
Add analysing to stream data
2024-10-01 17:01:17 -04:00
Isaac Connor
Isaac Connor
Bryan O'Donoghue
IgorA100
Ben Dailey