c2472894be
Fix html emails when using ZM_NEW_MAIL_MODULES. Improve debugging and reduce Info logging
2021-09-10 13:47:40 -04:00
a9379e5813
Need to increase frame_count or else frame_count%frame_mod will never == 0
2021-09-10 10:58:06 -04:00
009b3ceffc
Fix version of Crud
2021-09-09 13:28:25 -04:00
e18f8019b0
canView takes a user object, not a string
2021-09-08 19:07:51 -04:00
a44bbf8e34
use get_packet_and_increment_it instead of the two step to improve locking
2021-09-08 18:35:01 -04:00
227e5794fa
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-08 18:32:46 -04:00
c5b097af0a
Only suspend/resume motion detection if the monitor is doing motion detection
2021-09-08 13:57:46 -04:00
b2415643f6
Add missing Importance member
2021-09-08 13:57:46 -04:00
68fc57ef7b
Merge pull request #3346 from criadoperez/fix-issue-3338
...
Fixed issue #3338
2021-09-08 09:30:59 -04:00
4b8ac48590
Merge pull request #3347 from criadoperez/fix-wikiurl
...
Fixed broken wiki links
2021-09-08 09:30:28 -04:00
4a717820b1
Fixed broken wiki links
2021-09-08 15:18:52 +02:00
876fca188b
Fixed issue #3338
2021-09-08 15:00:11 +02:00
f576613c7d
Merge pull request #3345 from Carbenium/ci-freebsd-13
...
Fix FreeBSD build and improve CI
2021-09-07 18:57:25 -04:00
6e96cbe14a
Misc: Merge ZM_HAS_V4L with ZM_HAS_V4L2
2021-09-08 00:19:08 +02:00
0ac060fb78
LocalCamera: Fix Wformat warnings on FreeBSD
2021-09-08 00:19:08 +02:00
443b84270a
LocalCamera: Add a missing include to fix FreeBSD build
...
Fixes #3330
2021-09-08 00:19:08 +02:00
c9f162f70e
CI/Cirrus: Disable Wdeprecated-declarations temporarily
...
Keep these warnings disabled until av_init_packet usage is removed.
2021-09-08 00:18:24 +02:00
c83882a4c7
Build: Move V4L2 detection into its own module
...
Improves detection across different platforms (esp. FreeBSD) since system paths are automatically taken into account (this is in contrast to check_include_file).
2021-09-08 00:18:24 +02:00
615e3dd76b
CI/Cirrus: Install V4L compat layer
2021-09-07 23:23:57 +02:00
5dc328e68b
CI/Cirrus: Add FreeBSD 13 to the build matrix
2021-09-07 19:15:24 +02:00
263a846251
Add missing fields. defaults need to be quoted because they are evalled
2021-09-04 10:43:38 -04:00
440bb12a9a
defaults need to be quoted because they are evalled
2021-09-04 10:43:25 -04:00
9d461203bd
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-09-04 10:17:52 -04:00
8c45739875
Add impish to possible distros to build
2021-09-04 10:17:41 -04:00
fe6f71e1dc
Leave the zoneminder source dir during build-deps step so that we don't pollute it. Seems to be an issue with newer ubuntu builds.
2021-09-03 21:57:54 -04:00
328bd15360
Fix frame_count fps when paused
2021-08-30 18:06:05 -04:00
381fa0d08d
Fix viewing fps display by keeping track of last update time, last frame count and actually calculate it based on frames sent over a period of time.
2021-08-30 17:55:32 -04:00
8199554217
Spacing and fix the bogus setting shared_data->valid to false on disconnect. Other processes call disconnect. Only the capturing thread should set it to false.
2021-08-30 13:33:26 -04:00
1a0d488457
Spacing
2021-08-30 13:32:43 -04:00
6b481fa2b5
Put back debhelper >= 11. We are deprecating stretch
2021-08-30 09:42:35 -04:00
d102732a7e
add autoplay tag. Fixes #3343
2021-08-29 09:44:04 -04:00
048b8b13a3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-08-29 09:17:36 -04:00
6de8c71d2a
Set shm->valid to false on disconnect.
2021-08-29 09:17:31 -04:00
4af979c842
spacing
2021-08-29 09:15:40 -04:00
a52b9057ba
stretch has debhelper 10
2021-08-27 11:40:46 -04:00
11137f9b7a
Merge pull request #3342 from gmanproxtreme/patch-1
...
Updated WEB_TITLE section from ToDo.
2021-08-27 10:14:46 -04:00
84ccf10e65
Updated WEB_TITLE section from ToDo.
...
The Web_Title's use was unknown. I have seen the changed title appear on the login screen. Documentation updated to reflect this.
2021-08-27 20:21:02 +10:00
a4c079d1b3
Add code to set colour ranges so that we can safely convert to YUV420p instead of YUVJ420P
2021-08-26 14:15:09 -04:00
dbe16a9cb4
Don't use AUTH_HASH_IPS when talking to zmu as it doesn't support that at this time.
2021-08-26 10:45:36 -04:00
7c1c8482c6
Make failure to resolve non fatal
2021-08-24 10:23:24 -04:00
2640791b89
spacing
2021-08-23 18:13:19 -04:00
848a537a0f
Fix zms giving 500 code instead of displaying error image due to not having sent the headers yet.
2021-08-23 18:10:31 -04:00
4596f61250
Merge pull request #3335 from r01k/master
...
Fixed "Call to undefined function" Exception in control_functions.php
2021-08-21 10:38:43 -04:00
79e041d0f0
Fixed bug that caused 'Call to undefined function Error()' in control_functions.php. Exception was being raised due to logger.php not being included in control_functions.php.
2021-08-20 22:42:57 -04:00
4a5bc88882
Always set image width to 100%. it should fill it's div and we will set the width of the div.
2021-08-19 18:57:00 -04:00
68a7635d9b
Only show thumbnail if Function is != None
2021-08-19 18:40:50 -04:00
7a6c244aa7
spacing. When the selected layout is not freeform, calculate the ratio of computed size to stream source size to calculate a value for scale.
2021-08-19 16:05:43 -04:00
89d7685b14
Change Montage Layouts to reset width when choosing Freeform. Use full width instead of slightly less. I think at some point I fixed our layout so that we can use 25% instead of 24.5% etc.
2021-08-19 15:42:39 -04:00
44823e0c94
spacing remove dead code
2021-08-18 18:40:25 -04:00
8ddec91870
Allow snapshot downloading
2021-08-18 10:53:59 -04:00
Isaac Connor
Isaac Connor
criadoperez
Peter Keresztes Schmidt
Isaac Connor
Isaac Connor
gmanproxtreme
r01k