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
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
IgorA100
742a821170
Add 'Decoder' => 'Декодер'
2024-02-28 00:30:43 +03:00
IgorA100
ebe8a26188
Add 'OnMotion' => 'При движении',
2024-02-28 00:26:30 +03:00
IgorA100
881cb5327e
Adding and correcting Russian translation
2024-02-28 00:19:47 +03:00
Isaac Connor
6da3fcd9cc
Don't specify zm as the db
2024-02-27 09:24:14 -05:00
Isaac Connor
f18f448a8c
Fix setting frames
2024-02-26 16:22:51 -05:00
Isaac Connor
676569be99
Merge pull request #3842 from IgorA100/patch-5
...
Changing uptime return line parsing for CpuLoad() & add CpuNicePercent, CpuIdlePercent, CpuUsagePercent to Server_Stats
2024-02-26 15:55:53 -05:00
Isaac Connor
c5db82c082
Remove TAPE state.
2024-02-26 15:47:39 -05:00
IgorA100
98a1c73fb2
Add CpuNicePercent, CpuIdlePercent, CpuUsagePercent to Server_Stats
2024-02-26 23:46:49 +03:00
IgorA100
d25a07eb04
Fix: ...
2024-02-26 23:19:28 +03:00
Isaac Connor
e78c873944
Remove TAPE state.
2024-02-26 14:36:27 -05:00
Isaac Connor
ed472bcfd7
Add remaining CpuUsage stats to Server_Stats
2024-02-26 13:54:48 -05:00
IgorA100
871ca68024
Changing uptime return line parsing for CpuLoad()
...
Changing uptime return line parsing for CpuLoad()
Depending on the locale it could be like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
or like this:
16:50:53 up 1 day, 1:10, 3 users, load average: 0.89, 0.94, 1.14
2024-02-26 17:06:23 +03:00
Isaac Connor
6db5ec7374
Bump version for 1.37.54 db update
2024-02-25 10:09:52 -05:00
Isaac Connor
2c7f83f96f
Merge pull request #3841 from ovargasp/master
...
Makes the "Events" part of the ONVIF URL configurable
2024-02-24 16:22:01 -05:00
Server
58d8cf0adf
Makes the "Events" part of the ONVIF URL configurable
...
as required per some ONVIF version 21.06 cameras
by default sets the Events Path equals to "/Events"
to maintain functionality
2024-02-24 11:05:08 -06:00
Isaac Connor
692e1ec745
Only allow loading user by only username if AUTH_RELAY=none. Log successful login as Debug
2024-02-24 07:54:40 -05:00
Isaac Connor
e1a141ed7d
Remove event_start_mode, not going to be used
2024-02-23 16:56:55 -05:00