76b75cc69b
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-28 10:47:02 -04:00
fee69d3bc2
is no longer in existence
2021-10-28 10:46:50 -04:00
0c157904e6
add js to manage the generate video button
2021-10-28 10:46:50 -04:00
2a160f045d
Put back generate video button
2021-10-28 10:46:50 -04:00
c2bd2dc129
Add a warning if db queue is larger than 10
2021-10-28 10:46:50 -04:00
9fe2762bc8
Add mp4 as an option for generated video and make it the default instead of avi
2021-10-28 10:46:50 -04:00
5955e4b410
add licensing info for fontawesome.
2021-10-28 10:46:50 -04:00
d8e4a77424
Merge pull request #3361 from criadoperez/debian-install
...
Added Debian 11 (bullseye) installation instructions
2021-10-28 09:55:07 -04:00
a946c45614
Merge pull request #3381 from SzymekCRX/patch-1
...
Critical bug in events.php
2021-10-28 09:13:23 -04:00
2bcad7bf5e
Critical bug in events.php
...
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
2021-10-28 07:43:44 +02:00
6478999ecf
Fix Event count subsitutions in emails because they are no longer in Monitor_Status. They are in Event_Summaries. So create a new object for them and use it.
2021-10-27 12:21:03 -04:00
a74b785d08
Move the protocol loading into the Monitor Object.
2021-10-26 18:15:43 -04:00
a2ec18be5a
Implement Control() function to implement the Protocol Specific Control object
2021-10-26 18:15:43 -04:00
d62d88a0a3
add utility functions parseNameEqualsValueToHash and hash_diff
2021-10-26 18:15:43 -04:00
c864d0765b
Update, add url parsing to match other control scripts. Add getConfig and setConfig
2021-10-26 18:15:43 -04:00
cebe86feb2
Make ZoneMinder::Control ingerit from Object. Make loadMonitor use MonitorId
2021-10-26 18:15:43 -04:00
d56de57494
set vertical-align:top on monitor edit labels
2021-10-25 16:55:23 -04:00
a55bd23bf6
Add some extra parenthesis to make sure the logic works right
2021-10-25 16:55:23 -04:00
1e38cf8bb7
Fix monitor type labels by adding an Unknown for entry 0. Implement Function_Strings. Fix decoding_enabled not being recalculated correctly because we havn't loaded savejpegs or videowriter yet.
2021-10-25 16:40:21 -04:00
51e77438fa
Add sort-name and sort-order to bootstrap table options. Also set data-remember-order=false. This allows orderings set by filters to work. Fixes #3348
2021-10-25 12:35:46 -04:00
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
ccdf002c18
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-10-19 15:27:14 -04:00
ac15ea42cd
enforce default action
2021-10-19 14:34:17 -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
Isaac Connor
Isaac Connor
SzymekCRX
Pascal Muetschard
makers-mark
Håvard Flaget Aasen