ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,078 Commits
32 Branches
93 Tags
161 MiB
Commit Graph

21078 Commits (b611a4fc08d332dcdec9464173998ca2043380d9)

Author SHA1 Message Date
Isaac Connor c937169a6b Fix logic inversion on test_pre_sql_conditions 2022-07-29 13:50:40 -04:00
Isaac Connor 4d31089707 Only decremember warned_count if > 0. Fixes too much logging. Add warning about keyframe interval being > max image buffer setting. 2022-07-29 13:49:34 -04:00
Isaac Connor 12c1011ff9 Use parseInt to turn '0' into 0 2022-07-29 10:44:28 -04:00
Isaac Connor d0cbb7b478 Sync up with c++ shm alignment to fix same size of 32bit 2022-07-29 10:27:18 -04:00
Isaac Connor d8dea37c88 When selecting AlarmedZone, must check for SCore > 0. 2022-07-28 16:33:38 -04:00
Isaac Connor 7f192c4e47 Merge pull request #3551 from dougnazar/fix_crash 
Fix zmc Segfault on 1.36.20
 2022-07-28 16:28:32 -04:00
Isaac Connor 33943acbc4 Code style, spacing. Move check for trailing slash into the if specified janus_path part 2022-07-28 16:27:28 -04:00
Isaac Connor f463246e43 Log reorder_queue_size 2022-07-28 15:46:01 -04:00
Isaac Connor 5cb5132bf7 Fix crash due to double delete of Janus_Manager 2022-07-28 15:26:32 -04:00
Isaac Connor b2bcd9bc25
Merge pull request #3545 from dougnazar/misc_fixes 
Misc fixes
 2022-07-27 12:42:44 -04:00
Doug Nazar a34db8bc38 Don't hardcode db in upgrade script. 2022-07-27 12:25:57 -04:00
Doug Nazar 590697bd80 Add padding to shared_data to re-align fields on 32bit 2022-07-27 12:25:47 -04:00
Isaac Connor bd304ecbec include ffmpeg.h. Fixes #3539 2022-07-26 19:09:16 -04:00
Isaac Connor abea055c37
Merge pull request #3541 from dougnazar/fix_ci_debian_packages 
CI: Only attempt to publish packages on push.
 2022-07-26 11:15:41 -04:00
Isaac Connor 8b80fd766c
Merge pull request #3543 from ben-rambam/master 
Enable building on ubuntu jammy
 2022-07-26 11:06:27 -04:00
Jonathan Mathews 7cc8cb17fa Enable building on ubuntu jammy 2022-07-26 09:36:27 -05:00
Doug Nazar 6e1901894f CI: Only attempt to create packages on push. 2022-07-25 11:33:54 -04:00
Isaac Connor 9b12797f75
Merge pull request #3540 from dougnazar/fix_stream_progress 
Use old event unpack() on 32bit systems.
 2022-07-24 21:03:24 -04:00
Isaac Connor 8788b372fe Don't reload img steam on auth hash change. Just update the global variable. 2022-07-24 20:39:09 -04:00
Isaac Connor d8493a676b Rough in functions to provide a gui to edit linked monitors. Current status is changing monitor_links and showing editing operators. Next up parenthesis. 2022-07-24 20:38:51 -04:00
Isaac Connor 2ba7d4d0b5 Rough in a function Events() to return Event objects from a Filter. 2022-07-24 20:37:32 -04:00
Doug Nazar 262c087800 Use old event unpack() on 32bit systems. 
PHP unpack() 64bit formats aren't available on 32bit.
 2022-07-24 04:28:37 -04:00
Isaac Connor 5fde6129dd Bump version to 1.37.19 for ONVIF_Alarm_Text changes 2022-07-23 16:10:38 -04:00
Isaac Connor 00c160da0c rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:09:26 -04:00
Isaac Connor 8a8a5fd5c0 rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:09:01 -04:00
Isaac Connor 917c3bd7ba rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:08:42 -04:00
Isaac Connor bfeee1ed09 rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:08:27 -04:00
Isaac Connor a3395df49f Rename ONVIF_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:07:45 -04:00
Isaac Connor d2d5b6e489 Add ONVIF_Alarm_text to zm_create.sql 2022-07-23 16:07:13 -04:00
Isaac Connor b527f532c3
Merge pull request #3538 from dougnazar/fix_ci 
Fix ci
 2022-07-23 10:15:32 -07:00
Doug Nazar 78962c461b Use docker image for centos 7 2022-07-23 04:05:40 -04:00
Doug Nazar a65e960ce6 Docker image of CentOS 7, GCC 8 & ZoneMinder dependencies 2022-07-23 04:05:38 -04:00
Doug Nazar c030416500 Fix truncation warning. 2022-07-22 19:52:09 -04:00
Doug Nazar 3b69a51ff8 Try to fix warning again that printf might exceed buffer. 
The last fix worked on GCC 11 & 12 but broke GCC 8.
 2022-07-22 12:00:42 -04:00
Doug Nazar cfa4cdc9a3 Use add_compile_options instead of add_compile_definitions 
add_compile_definitions is not available until version 3.12.
 2022-07-22 11:05:14 -04:00
Doug Nazar 9c40e2bb86 CI: Remove CI workflow for Debian Stretch 
Debian Stretch has finished LTS and is too old for current code base.
 2022-07-22 10:36:16 -04:00
Doug Nazar 447fd3efd0 CI/Cirrus: Update to FreeBSD 12.3 2022-07-22 10:20:10 -04:00
parvit (Vittorio Parrella) e4a8017b6b
added configuring of authentication for rstp cameras 2022-07-22 07:08:22 -04:00
Isaac Connor 95530a4f7d
Merge pull request #3529 from dougnazar/fix_printf_formats 
Fix printf formats & enable large file support for 32-bit
 2022-07-20 11:44:26 -07:00
ovargasp 981769b9db
Allows users to set an specific "Onvif alarm text" for each monitor (#3535) 
* Allows users to set an specific "Onvif alarm text" for each monitor

With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text"  value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.

Updated es_la.php language file.

Co-authored-by: ovargasp <ovargasp@hoitmail.com>
 2022-07-20 12:51:13 -05:00
Isaac Connor 2c32d09759
Merge pull request #3530 from dougnazar/disable_systemd 
Add option to disable auto detection of systemd.
 2022-07-16 09:24:54 -07:00
Isaac Connor 84ac9f592f
Merge pull request #3531 from dougnazar/fix_freebsd 
Fix compile FreeBSD 13.0
 2022-07-16 09:24:22 -07:00
Doug Nazar 5b44ee729d Fix sendfile calling convention taking into account possible null offset parameter. 2022-07-16 10:05:46 +00:00
Doug Nazar df414fc028 Need to cast duration to system_clock resolution. 2022-07-16 10:03:54 +00:00
Doug Nazar 3c5e44dfe5 Need unistd.h for getpid(). 2022-07-16 10:03:16 +00:00
Doug Nazar 0db4a18ff6 Switch to unsigned int for loop to restrict size of printf. 
GCC 12 incorrectly detects a format truncation.

src/zm_logger.cpp:86:39: warning: ‘%d’ directive output may be truncated writing between 1 and 11 bytes into a region of size 2 [-Wformat-truncation=]
   86 |       snprintf(code, sizeof(code), "DB%d", i);
      |                                       ^~
src/zm_logger.cpp:86:36: note: directive argument in the range [-2147483647, 9]
   86 |       snprintf(code, sizeof(code), "DB%d", i);
      |                                    ^~~~~~
 2022-07-16 03:21:25 -04:00
Doug Nazar ca1cca2ff4 Add _FILE_OFFSET_BITS=64 define to enable large file support on 32-bit. 2022-07-16 03:20:20 -04:00
Doug Nazar 3b21153757 Fix various printf formats for 32bit, 32bit w/_FILE_OFFSET_BITS=64 and 64-bit 2022-07-16 03:18:18 -04:00
Doug Nazar 02a79f79f0 Add option to disable auto detection of systemd. 2022-07-16 03:12:27 -04:00
Isaac Connor 2d335f6e12 Don't reload img steam on auth hash change. Just update the global variable. 2022-07-15 06:47:45 -04:00