Commit Graph

23439 Commits (067ca68549d411c74243e40beffb66b13f9fffb4)

Author SHA1 Message Date
Isaac Connor 067ca68549 Add debugging of db failures 2024-03-04 13:20:21 -05:00
Isaac Connor 6f467dd0d4 Revert "regexp: port to pcre2"
This reverts commit fd09feb5f4.
2024-03-04 09:54:18 -05:00
Isaac Connor b9da90522b Wait forever until reconnect, the fallthrough case had us retrying the sql on a closed connection which may have led to a crash. 2024-03-04 09:32:15 -05:00
Isaac Connor 89de8b7765
Merge pull request #3845 from IgorA100/patch-8
Added a link to live viewing from monitor event viewer
2024-03-03 14:29:57 -05:00
IgorA100 55244441c3
Add processing for clicking on the button to view all events 2024-03-03 18:50:02 +03:00
IgorA100 1793e7813c
Added value "Edit" to "translate" array for translation 2024-03-03 18:20:40 +03:00
IgorA100 45bf972fea
Ref: style
Bootstrap is now used more
2024-03-03 18:14:29 +03:00
IgorA100 99779681fb
Fix: style
Not required, because now using Bootstrap
2024-03-03 17:27:14 +03:00
IgorA100 21abe20234
Fix: style
Not required, because now using Bootstrap
2024-03-03 17:26:09 +03:00
Isaac Connor dbff17e294
Merge pull request #3824 from davvid/debian/pcre2
regexp: drop obsolete pcre3 and port regexp usage to pcre2
2024-03-03 09:25:03 -05:00
IgorA100 373fa15440
Fix: rem style
Not required, because now using Bootstrap
2024-03-03 17:21:30 +03:00
IgorA100 9aa8919fb8
Fix: Button layout 2024-03-03 17:04:59 +03:00
IgorA100 6ea195b8b1
Fix: Button layout 2024-03-03 17:01:50 +03:00
IgorA100 0d5d495bbf
FixL Recalculation of height and width if "padding" is specified for "wrapperEventVideo" 2024-03-03 16:56:50 +03:00
IgorA100 84d8aa9e52
Ref: Responsive design 2024-03-03 16:49:54 +03:00
David Aguilar 17a218a5a3 fixup! debian/control: drop dependency on pcre3 2024-03-02 17:19:08 -08:00
David Aguilar fd09feb5f4 regexp: port to pcre2
Update pcre usage to be compatible with pcre2.
2024-03-02 17:19:08 -08:00
David Aguilar 3dd9bdc121 debian/control: drop dependency on pcre3
pcre3 is deprecated and was replaced by pcre2. This fixes the issue
that caused zoneminder to be dropped from Debian/testing.

A flavor of this patch has already been submitted to Debian:
https://salsa.debian.org/debian/zoneminder/-/merge_requests/2

Related-to: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=999919
2024-03-02 17:19:08 -08:00
Isaac Connor bcd3319c9e
Merge pull request #3848 from Simpler1/progressBar
Eliminate event progress bar overlap for classic and dark.  (consistent with base)
2024-03-02 15:50:50 -05:00
Simpler1 ccaaf6aaf5 Consistency 2024-03-02 14:12:59 -05:00
Simpler1 d7eca5bb23 fix(event): Keep progressBar from overlapping videojs control. 2024-03-02 14:10:25 -05:00
Isaac Connor 904f062769
Merge pull request #3847 from Simpler1/patch-2
fix(tags): Tags were not populated on watch view
2024-03-02 11:37:40 -05:00
Simpler1 3d008263e4
fix(tags): Tags were not populated on watch view 2024-03-02 11:30:35 -05:00
Isaac Connor dc23beaf10 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-03-02 11:19:34 -05:00
Isaac Connor 26231c4579 Return 0 if packet is not for video or audio stream 2024-03-02 11:19:27 -05:00
Isaac Connor d0d47a81d3
Merge pull request #3846 from Simpler1/patch-1
Placeholder text for monitor date time format.
2024-03-02 11:12:11 -05:00
Isaac Connor 19e6e9baf2
Merge pull request #3707 from Simpler1/default_sound
feat(sound): Include default alarm sound (again)
2024-03-02 11:11:03 -05:00
Isaac Connor e4a2f9879e Don't assume video if not audio, could be data 2024-03-02 11:00:03 -05:00
Simpler1 7fdc204082 feat(): Custom snapp.ogg sound for ZoneMinder 2024-03-02 10:15:44 -05:00
Isaac Connor bb4858103d Increase time jump to 40 seconds because Avigilon cameras seem to do this a lot 2024-03-02 09:58:22 -05:00
Simpler1 e1e255393d typo 2024-03-02 09:55:08 -05:00
Simpler1 6ff4c3f7ec Added additional parameters 2024-03-02 09:52:55 -05:00
Simpler1 ea0c79d976
Placeholder text for monitor date time format.
After spending an hour trying to figure out which date time format to enter here, I thought it would be best to just spell it out for users trying to customize this.
2024-03-01 16:59:17 -05:00
Isaac Connor ecab601c21 Use array_values to discard the keys in the array of monitorIds 2024-03-01 16:13:52 -05:00
Isaac Connor 8a42594009 Upgrade bootstrap-table to 1.22.3 2024-03-01 11:44:06 -05:00
Isaac Connor 753741ca78 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-02-29 23:33:03 -05:00
Isaac Connor 24e38f4d9e Add missing ONVIF_Event_Path from 1.37.54 update 2024-02-29 23:32:56 -05:00
Isaac Connor 02785fb81d
Merge pull request #3844 from IgorA100/patch-7
Adding and correcting Russian translation
2024-02-29 15:22:17 -05:00
Isaac Connor 9cd048d97b Only try to set monitor_permissions for non-deleted Monitors 2024-02-29 09:19:19 -05:00
Isaac Connor 04017b20f1 Make recording=onmotion respect post_event_count 2024-02-29 09:02:07 -05:00
Isaac Connor c33ec9833a Only show non deleted monitors in linked monitors 2024-02-29 08:59:14 -05:00
IgorA100 43cd675d96
Added value "Live" to "translate" array for translation 2024-02-29 15:12:33 +03:00
IgorA100 a6b9ba5a1d
Added a link to live viewing from monitor event viewer 2024-02-29 15:07:41 +03:00
Isaac Connor a28df623f2 Fix canEdit is a hash, not a function 2024-02-27 19:18:09 -05:00
Isaac Connor 0128873ca7 Spacing, some better debug 2024-02-27 18:41:31 -05:00
Isaac Connor 3eede7228c Use Importance when logging about time jumping back too far 2024-02-27 17:39:52 -05:00
Isaac Connor c48ccd3ce2 Add autocomplete to onvif_username and fix case when local inputs aren't there after switching from non-local to local because Method is now wrong. 2024-02-27 17:39:34 -05:00
Isaac Connor ad53ebb8a8 Handle when inputs don't exist. 2024-02-27 17:38:48 -05:00
Isaac Connor c1b65185b5 Handle when inputs don't exist. 2024-02-27 17:38:45 -05:00
Isaac Connor c51c53c47a FIx use of inline javascript for the method dropdown on remote type monitors 2024-02-27 16:50:52 -05:00