888d79706a
Add zm_rtsp_server to ignores
2021-09-25 16:08:58 -04:00
a99f9091fc
remove useless commit.
2021-09-25 14:27:10 -04:00
2f12615f08
assign REQUEST['newMonitor'] to a variable to simplify code. Fixup ModelId and ManufacturerId saving.
2021-09-25 10:33:16 -04:00
7ca7d40b6f
Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them
2021-09-25 10:32:04 -04:00
c78e035057
Fix crash due to int64 cast to a %ld format.
2021-09-23 19:07:07 -04:00
aae967e895
Add mmal device/pix fmt type
2021-09-23 16:39:35 -04:00
7748307c5a
More new defaults. The navbar refreshes every 60 secs so make full page refresh be 240sec. Ajax timeout needs to be 10 seconds. Large event listings can take longer than 3
2021-09-23 16:39:35 -04:00
d3cfd3c224
Set new defaults for various settings
2021-09-23 16:39:35 -04:00
30fa641186
initialize video_first_pts and when setting it need to specify microseconds otherwise we get nanoseconds. White space.
2021-09-21 14:29:05 -04:00
1cb9f98e9b
Restore the download button's behaviour. It is a simple link to the mp4, not an export. Also add a handler for the video.js rate control to sync up our non video.js rate dropdown and stored cookie.
2021-09-21 13:01:05 -04:00
160f775f91
Always include the download button so that we can assume that it exists in the js. So avoid console errors when no mp4.
2021-09-21 13:01:05 -04:00
dd6adc08a8
Set rows on email textarea
2021-09-21 13:01:05 -04:00
4b1da156a0
Add open collective username
2021-09-21 13:01:05 -04:00
a7f13c82d5
Docs: Fix a typo ( #3358 )
2021-09-20 14:04:07 +02:00
2724a238e1
Update italian (it_it) translation ( #3357 )
2021-09-20 14:02:35 +02:00
fba7dba3d0
Reduce logging level to debug dealing with index == -1, which is used in zmu to mean the last captured image. Fixes #3354
2021-09-16 10:03:30 -04:00
1700e2f919
Merge pull request #3355 from ColorfullyZhang/master
...
Set mysql character set to utf8 explicitly
2021-09-16 09:49:19 -04:00
f5d8eaa2ad
Set character set as utf8 when connect to mysql to avoid mistakes when there are Chinese characters in storage path.
2021-09-16 18:24:37 +08:00
6009bba339
Set mysql character set to utf8 explicitly to support chinese characters (or other special characters).
2021-09-16 14:41:24 +08:00
e6f4cdb584
Remove redundant notify_all, spelling mistake
2021-09-15 13:38:06 -04:00
547fed2e22
Merge pull request #3353 from SudoMike/image_fix
...
Fixed a bug in Image::Buffer
2021-09-15 13:31:31 -04:00
3f97df72c8
Fixed a bug in Image::Buffer that would return the wrong location in the image if the image had > 1 channels (and if the request were for x > 0).
2021-09-15 10:13:02 -07:00
1ee85caaae
Don't crash when unable to create source. erase will call the desctructor. Fixes #3344
2021-09-15 12:56:39 -04:00
d2cf89565e
wait won't wake up other threads, so notify first. Since we have the lock, this should be ok
2021-09-15 12:53:41 -04:00
03f0762709
Add support for package version
2021-09-14 18:08:50 -04:00
bf5c0a8617
More properly fix the threading lock. Instead of waiting on a packet, release it and wait on the packetqueue.
2021-09-14 16:21:32 -04:00
167dece604
Revert "use get_packet_and_increment_it instead of the two step to improve locking"
...
This reverts commit a44bbf8e34
2021-09-14 15:47:35 -04:00
e140620900
notify anyone waiting in packetqueue before waiting on a packet in motion detection. Should fix decode lockup
2021-09-14 13:38:55 -04:00
7aa955abd2
Fix js error in montage review when using scaled mode. Fixes #3351
2021-09-14 10:26:17 -04:00
503f0da9da
Merge pull request #3352 from vezza/patch-3
...
Update it_it.php
2021-09-14 09:51:21 -04:00
3e5d377f7a
Update it_it.php
2021-09-14 15:39:53 +02:00
966749ff86
Update it_it.php
2021-09-14 15:16:25 +02:00
58f933ba1e
Add missing update_function_pointers so that we use SSE blend functions. Significantly reduces cpu use in motion detection.
2021-09-13 15:03:42 -04:00
a05560e797
fix merge of version
2021-09-13 09:30:29 -04:00
dd2a12675f
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-09-13 09:30:04 -04:00
97c10fc135
Update it_it translation ( #3350 )
2021-09-13 13:28:48 +02:00
5fda85bf2e
Image: Codestyle changes
2021-09-12 11:38:44 +02:00
ecf6cc80aa
Image: Fix Wclobbered warnings
...
From C99 spec:
[...] objects of automatic storage duration that are local to the function containing the invocation of the corresponding setjmp macro that do not have volatile-qualified type and have been changed between the setjmp invocation and longjmp call are indeterminate
Remove the variables in question or pass them as const refs.
2021-09-12 11:36:51 +02:00
15adc47c61
Merge branch 'master' into add_manufacturer_model_to_monitors
2021-09-10 18:24:44 -04:00
385d1602e0
Add an example fail2ban rule as provided by Pedulla
2021-09-10 13:54:24 -04:00
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
Isaac Connor
Isaac Connor
Isaac Connor
5472qaywsx
Andrea Vezzali
ColorfullyZhang
Mike Dussault
Peter Keresztes Schmidt