0c222f66ee
Add sort_asc, sort_field and limit to the filter QueryString
2021-10-25 12:34:51 -04:00
8afed25d18
Use filter->sort_asc and sort_field which will use either the value specified in query, or defaults set in system. url params order and sort will override.
2021-10-25 12:34:28 -04:00
5e21d4833a
Remove dead code, remove locking from CopyTo, put locking into MoveTo.
2021-10-25 11:09:29 -04:00
9169da6963
Only start a transaction if we are not already in a transaction
2021-10-25 11:09:06 -04:00
c6eedd434c
Make delete dialog disappear on success. Fixes #3377
2021-10-22 20:59:04 -04:00
4351f51929
Fix logic ordering in 1.35.14 updated that moves columns from Monitors table to Monitor_Status
2021-10-20 13:14:04 -04:00
52f0240334
free and re-init opts as needed
2021-10-19 13:05:11 -04:00
6d7f752eb0
Only record when in modect or nodect. Linked monitors would cause a monitor in monitor mode to record
2021-10-19 13:04:49 -04:00
16d0e269df
WHen saving v4l settings redirect back to watch instead of console.
2021-10-19 12:39:37 -04:00
bfcc6ed13e
Merge pull request #3376 from pmuetschard/encoder_opts
...
Respect the encoder options for the header write.
2021-10-19 12:37:59 -04:00
14e6d660e7
Respect the encoder options for the header write.
...
Fixes an issue where the encoder options were ignored in the
passthrough case, because the options were free'ed and not
re-initialized.
2021-10-18 20:15:02 -07:00
9f023f7bdd
Merge pull request #3372 from SudoMike/writable_image_buffer_function
...
Added non-const versions of Image::Buffer
2021-10-17 19:11:39 -04:00
4af605e675
Merge pull request #3374 from makers-mark/master
...
Fix typo
2021-10-17 19:10:34 -04:00
d1596dee02
Fix removing uneeded checked
2021-10-17 19:08:12 -04:00
276add8ee4
Fix typo
2021-10-17 16:03:52 -04:00
e1d49ea172
fix index -> image_index
2021-10-17 15:13:34 -04:00
3f6d6fe7a0
Improve debug logging of packetqueue cleaning
2021-10-17 15:02:31 -04:00
c05200d2a7
Merge pull request #3373 from havardAasen/minor_fixes
...
Update man-pages and typos.
2021-10-17 11:54:48 -04:00
f2281d1017
Typos in documentation
...
This is typos noticed by lintian.
2021-10-17 13:29:00 +02:00
5970416f0b
Fix errors when converting man-pages with pod2man.
...
Change unrecognised characters to corresponding ASCII value.
pod2man generates errors when encountering non-ASCII characters.
It correctly guesses UTF-8, but it still displays an error message
in the produced man-page.
2021-10-17 13:23:41 +02:00
d960f9b6af
Fix settings being blank due to missing v4l2-ctl
2021-10-16 13:19:19 -04:00
6c4156a483
Remove sleeping from Analysis thread. It is uneccessary and results in us starting off way behind the capture thread. It also limits us to 30fps.
2021-10-15 09:56:14 -04:00
1606f7918a
Show ram/swap usage in bytes instead of kb. Correct title of ram vs swap.
2021-10-15 09:40:58 -04:00
809cb651c0
remove debug hello
2021-10-14 17:56:16 -04:00
5f381a244f
Improvements to export. Fix tar -v, should be tar --version. make table width:100% and iframe height 100%. Always show thumbnail of video. Show Id of event if no other links. generate Images frame content event if no jpegs but there is an mp4. Set timeout to infinity for generating export. Provide more feedback if it breaks. Fix ticker.
2021-10-14 17:56:02 -04:00
d71a5932f5
Turn off useless shm display in header. Add ram and swap usage
2021-10-14 13:33:29 -04:00
452d28a66b
Turn off useless shm display in header. Add ram and swap usage
2021-10-14 13:31:35 -04:00
26ac52aaa9
Fix scaling the image after changeScale. Limit stream scale to 100, let browser do the scaling
2021-10-14 13:00:49 -04:00
086bf7a84f
introduce new logic that keeps the initial keyframe and deletes 1 video frame after it to keep the count down. Also any audio frames it encounters.
2021-10-14 12:47:51 -04:00
411d15605a
We can lockup if MaxImageBufferCount is less than keyframe interval. Give up after 10 tries and drop the packet
2021-10-14 10:08:51 -04:00
8a9c283c1c
Fix loading importance. Needs to be -1 not -2. The first value is 1, but we want zero based.
2021-10-13 16:06:22 -04:00
64ab429519
Correct definition of Importance. Want less importance to have a hgiher value. Make not null.
2021-10-13 16:05:49 -04:00
74ac79479f
notifying before waiting serves no purpose because we have the lock
2021-10-13 15:02:07 -04:00
4fee4d01e3
always correct decoding_enable, as zms needs to know it's correct value
2021-10-13 15:01:46 -04:00
00f9cb791c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-13 13:43:10 -04:00
f60282eaf5
Test for existence of AutoEmail and AutoMessage. Fixes #3369 issue 2.
2021-10-13 11:58:22 -04:00
6fd33b4627
Change commands used to set and goto presets. Fixes #3371
2021-10-13 10:42:23 -04:00
d38a6adec4
No behavior change. Added non-const versions of Image::Buffer and fixed a few places that were casting away the constness.
2021-10-12 21:54:49 +00:00
2056172ea9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-12 14:12:20 -04:00
126a102426
confirm before tar-gzipping orig. Fix default behaviour in dput prompt
2021-10-12 14:12:16 -04:00
0bac052a0a
Merge pull request #3370 from SudoMike/add_benchmarks
...
Add a zmbenchmark program
2021-10-12 13:43:00 -04:00
5cdc0efdb8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-12 13:22:53 -04:00
aafec8ead6
Put actions and options in a div, remove hr's and style the resulting div have the borders and clearing required. Make email options 100%
2021-10-12 13:22:41 -04:00
cd45c61555
Use mt19937 as PRNG
...
Reasons: It's faster than rand() and can be made thread-safe
2021-10-12 19:18:21 +02:00
c027b7a38d
Fix some clang-tidy warnings
2021-10-12 19:05:22 +02:00
97b38bd4ab
Align changes with our codestyle
...
See https://google.github.io/styleguide/cppguide.html for reference
2021-10-12 18:53:31 +02:00
c6cac57fb1
remove bogus wanring
2021-10-12 12:45:06 -04:00
0ba3d863a6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-12 12:25:01 -04:00
814124251e
Fixed a CodeQL complaint
2021-10-11 23:57:20 +00:00
2cf16eb495
Removed some unused code and added more function comments
2021-10-11 15:58:30 -07:00
Isaac Connor
Isaac Connor
Pascal Muetschard
makers-mark
Håvard Flaget Aasen
Mike Dussault
Peter Keresztes Schmidt