c3fa5bc15a
Fix adding rotation when not needed.
2025-01-02 14:15:01 -05:00
4e70c36cfa
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-01-01 12:05:50 -05:00
4b34efa1cd
DO like we do in 1.36 and only update the db monitor_status table every 10 seconds instead of every second.
2025-01-01 12:05:43 -05:00
24ad12fa22
Don't include empty fields in filter query string, just to shorten it a bit
2024-12-21 14:34:35 -05:00
27dfdd1b4e
Upgrade Amcrest to use parent's code
2024-12-21 14:32:48 -05:00
7b59995a48
Use parent's credentials in HikVision
2024-12-21 14:32:48 -05:00
72330a5234
Fix api url getting monitors for map
2024-12-18 13:44:20 -05:00
0bbaedc5d9
Add explicit path to sphinx conf.py as required by readthedocs
2024-12-18 12:27:38 -05:00
dae071bd10
Don't show deleted monitors in zones
2024-12-17 16:09:42 -05:00
6ec0b5a1dc
Fix SQL query when a user is limited to a subset of monitors and tries to view all zones.
2024-12-17 15:58:23 -05:00
4dcab65d51
document what scaleEl is
2024-12-16 10:57:16 -05:00
3aaba3154b
Move changeScale down as the video area has to have height before we can call scaleToFit
2024-12-16 10:56:43 -05:00
7b6d4952bd
Revert "Don't allow a scale of 0. Default to 100. Call changeStreamQuality after changeScale so that we always pass the right value. Prevents Errors in logs about bogus scale value"
...
This reverts commit 223dc4b70f
2024-12-16 10:45:30 -05:00
b71d6e4569
Merge pull request #4198 from sertonix/gzip-n
...
Strip build time from compressed manpages
2024-12-16 10:38:49 -05:00
16e02e11cd
Strip build time from compressed manpages
...
The manpage compression metadata include the true build time (and not
SOURCE_DATE_EPOCH like the manpages themselves). Excluding the build time
allows the manpage to be build reproducibly.
Ref https://reproducible-builds.org/
2024-12-16 16:07:43 +01:00
55b99e19ab
Use a redirect on homeview to fix having query params added on
2024-12-13 12:19:30 -05:00
4c4ae608e0
Fix quoting on default for Importance
2024-12-13 11:40:39 -05:00
36f45fdbc7
Wait until we get a successful shm connect before trying to set StartupTime. fixes crash
2024-12-12 12:21:32 -05:00
3fbb8bdaca
Fix ffm=>video_out_stream
2024-12-10 15:45:39 -05:00
df0438d487
Fix lack of support for rotation in ffmpeg 5.1 onwards
2024-12-10 15:20:15 -05:00
9700ecf773
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-12-09 19:10:47 -05:00
223dc4b70f
Don't allow a scale of 0. Default to 100. Call changeStreamQuality after changeScale so that we always pass the right value. Prevents Errors in logs about bogus scale value
2024-12-09 19:08:35 -05:00
0d34e4647a
Log scale in debug about status command
2024-12-09 19:07:51 -05:00
8c8a689c4a
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-12-09 17:28:03 -05:00
ffeec4cdec
Add E.Id != and use >= and <= when comparing StartDateTime so that we don't skip events with the same startDateTime. Fixes #4186
2024-12-09 17:27:56 -05:00
d4b3edfca6
Fix debug string
2024-12-09 17:21:11 -05:00
edb0836fe1
Fix not being able to undelete a monitor
2024-12-09 12:27:42 -05:00
14d6234e57
Make frame send time a debug
2024-12-09 12:26:51 -05:00
15dfaa5fc0
Merge pull request #4193 from Aleksanderk123/More-language-changes
...
More language changes
2024-12-04 18:09:13 -05:00
313442707e
Translated language list
2024-12-04 23:35:59 +01:00
5586cae348
Update en_gb.php
...
Added norwegian language to the list of languages
2024-12-04 23:30:34 +01:00
57fb0cba1b
Check for existing monitorStream to avoid js errors
2024-12-04 15:07:29 -05:00
ea41d4f6b6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-12-04 12:21:38 -05:00
7423888e87
Merge pull request #3 from Aleksanderk123/revert-2-master
...
Revert "Merge pull request #4192 from Aleksanderk123/master"
2024-12-04 01:08:06 +01:00
2437c9e4a7
Revert "Merge pull request #4192 from Aleksanderk123/master"
2024-12-04 01:07:37 +01:00
a6ef16838b
Merge pull request #2 from ZoneMinder/master
...
Merge pull request #4192 from Aleksanderk123/master
2024-12-04 01:06:37 +01:00
a0c6ad5b0f
Merge pull request #4192 from Aleksanderk123/master
...
Added Norwegian language
2024-12-03 18:35:07 -05:00
99ea84d92e
Merge pull request #1 from Aleksanderk123/Norwegian-Language
...
Norwegian language
2024-12-04 00:23:35 +01:00
4c0e037b2f
Norwegian Translation
2024-12-04 00:21:35 +01:00
8afdec1cdc
Uploaded Partially Norwegian language
2024-12-03 21:55:35 +01:00
19aca785c2
When invalid monitor id specified, pop up an alert instead of a bunch failed js. Handle livestream not existing.
2024-12-03 12:54:04 -05:00
0755d56cba
Must update iterator
2024-11-30 10:39:42 -05:00
66651824b5
Must move iterators for all deleted packets
2024-11-29 16:38:34 -05:00
697db024e1
Add more debug
2024-11-28 19:24:22 -05:00
043886be5e
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2024-11-28 17:01:48 -05:00
52c41d166b
When deleting packets in queuePacket if it is a keyframe, then delete everything from the beginning, so that we don't get a huge time gap between the first packet and the next
2024-11-28 17:01:13 -05:00
9125b8e6f9
Add support for sorting by Notes. Warn when the sort_field is unsupported
2024-11-27 13:56:35 -05:00
359330b384
When loading prev/next event, sort by StartDateTime, not Id. Id's are not guaranteed to be time-wise sequential. Maybe Fixes #4186
2024-11-27 13:55:50 -05:00
d42040d7c3
Add grouping by Monitor. Apparently mysql is complaining about not having it now.
2024-11-27 13:54:24 -05:00
0128cd1e57
Handle no .imageFeed present
2024-11-25 12:39:14 -05:00
Isaac Connor
Isaac Connor
Sertonix
Aleksanderk123