Isaac Connor
|
cae8978501
|
add an alignment variable to ffmpeg_camera to use wherever we want to tell ffmpeg about the buffer and linesize alignment. Figure out linesize in the constructor so that zm_monitor can pass the info along to zm_image.
|
2020-07-07 16:12:14 -04:00 |
|
Isaac Connor
|
864cd4c178
|
introduce a linesize variable which represents the # of bytes to hold a line of the image in the buffer. May be > width * colours
|
2020-07-05 17:51:57 -04:00 |
|
Isaac Connor
|
cc0624eb3f
|
Don't allow viewing of monitor setting if monitor permissions are set to View
|
2020-07-03 19:19:13 -04:00 |
|
Isaac Connor
|
1860ad188b
|
Don't allow viewing of zones or zone if Monitor permissions are view
|
2020-07-03 19:18:36 -04:00 |
|
Isaac Connor
|
343d8d832e
|
handle scale values of '' and 'auto'
|
2020-07-03 19:18:05 -04:00 |
|
Isaac Connor
|
2026788e7a
|
Turn close link into a button
|
2020-07-03 19:17:26 -04:00 |
|
Isaac Connor
|
66b155008c
|
Fix scale defaulting to monitor default Scale
|
2020-07-03 19:17:11 -04:00 |
|
Isaac Connor
|
9f821c74f6
|
Add tooltip on Add Monitor button explaining that the user doesn't have permission to add a monitor
|
2020-07-03 19:16:41 -04:00 |
Isaac Connor
|
402ab9ad9f
|
Bump version to 1.34.16 for release
|
2020-06-05 16:38:20 -04:00 |
|
Isaac Connor
|
910d4b51c9
|
Escape table names for mysql-8
|
2020-06-04 11:44:59 -04:00 |
|
Isaac Connor
|
20e6a1f53d
|
Use single quotes when escaping password so that $ has no effect. Also escape any single quotes in the password.
|
2020-06-04 11:37:44 -04:00 |
|
Isaac Connor
|
8802447b10
|
Handle no DB_HOST specifed so default to localhost
|
2020-06-04 11:36:10 -04:00 |
|
Isaac Connor
|
f8a11633bb
|
Handle no db_host specified, meaning local unix socket
|
2020-06-04 11:35:48 -04:00 |
|
Isaac Connor
|
ef3fc758cb
|
in getDiskPercent we have calls to Error without the ZM namespace. Fixes #2954
|
2020-06-04 11:34:48 -04:00 |
|
Isaac Connor
|
a7ef8e3dc8
|
detaint command before performing backup. Fixes #2945
|
2020-05-29 14:53:42 -04:00 |
|
Isaac Connor
|
20870e22fa
|
fix eslint errors
|
2020-05-29 13:28:33 -04:00 |
|
Isaac Connor
|
58a015e20a
|
fix use of printMsg
|
2020-05-29 12:20:39 -04:00 |
|
Isaac Connor
|
2637c887f8
|
Fix segfault when timestamp contains an unimplemented character. Fixes #2943
|
2020-05-29 11:44:34 -04:00 |
|
Isaac Connor
|
eb41e4fb39
|
Fix the array for the de-interlacing options
|
2020-05-24 11:09:13 -04:00 |
|
Isaac Connor
|
2c347d0518
|
Bump version to 1.34.15 for release
|
2020-05-20 10:41:22 -04:00 |
|
Isaac Connor
|
ce15e1c921
|
remove debug, don't pass element through event handler anymore on layout ddm
|
2020-05-20 09:42:29 -04:00 |
|
Isaac Connor
|
cc04ced406
|
load zmMontageLayout ddm explicitly instead of passing event element
|
2020-05-20 09:42:06 -04:00 |
|
Isaac Connor
|
4dc693022e
|
Failure to parse output shouldn't be fatal. Just skp to the next instead. Use json_encode instead of serialize
|
2020-05-15 16:02:19 -04:00 |
|
Isaac Connor
|
9ea1c637f9
|
Remove debug Exiting message
|
2020-05-15 11:48:41 -04:00 |
|
Isaac Connor
|
f79a17f302
|
Bump version to 1.34.14 for release
|
2020-05-15 11:35:59 -04:00 |
|
Isaac Connor
|
c4c4c5bcbf
|
fix Crud submodule version
|
2020-05-15 11:34:34 -04:00 |
|
Isaac Connor
|
424a4ed0b1
|
add onclick to div.zoom
|
2020-05-15 11:34:23 -04:00 |
|
Isaac Connor
|
0dd426d64c
|
handle range being set to an empty value. Fixes zoom out on timeline. Fix on-click to data-on-click
|
2020-05-15 11:33:10 -04:00 |
|
Isaac Connor
|
94b29c6c7a
|
replace inline javascript in timeline zoom
|
2020-05-15 10:44:48 -04:00 |
|
Isaac Connor
|
7a85be59be
|
Remove errant closing db debug output
|
2020-05-15 10:22:58 -04:00 |
|
Isaac Connor
|
4fed2d6d26
|
bump version to 1.34.13 for release
|
2020-05-14 12:20:14 -04:00 |
|
Isaac Connor
|
25a772c5eb
|
reorder logic a bit to make it easier to read. Make exit_zmu not return a value.
|
2020-05-14 12:02:02 -04:00 |
|
Isaac Connor
|
16e7ca5a51
|
failure opening a monitor should not be fatal.
|
2020-05-14 12:01:24 -04:00 |
|
Isaac Connor
|
402c0c6a1b
|
Fix build on older ffmpeg
|
2020-05-14 12:01:03 -04:00 |
|
Isaac Connor
|
efbab4e2bc
|
Dont' call mysql_library_end as it segfaults and hangs.
|
2020-05-14 12:00:36 -04:00 |
|
Isaac Connor
|
88a910793c
|
Spacing
|
2020-05-13 08:06:55 -04:00 |
|
Isaac Connor
|
e24b6214b1
|
test logFile before doing regexps on it
|
2020-05-13 08:05:58 -04:00 |
|
Isaac Connor
|
bbf64de40e
|
If there is a failure when decoding due to lack of support for the codec profile, re-init without hwaccel
|
2020-05-13 08:04:53 -04:00 |
|
Isaac Connor
|
edd718afd2
|
xtell and ytell are data-xtell and data-ytell fixes #2932
|
2020-05-13 08:02:49 -04:00 |
|
Isaac Connor
|
f72ad1023c
|
As params are passed in command, they should not be fatal to the control process
|
2020-05-13 08:02:40 -04:00 |
|
Isaac Connor
|
f2ec6b13e6
|
Add focal builds
|
2020-05-08 18:45:21 -04:00 |
|
Isaac Connor
|
8d74a973fc
|
Bump version to 1.34.12 for release
|
2020-05-08 18:00:49 -04:00 |
|
Isaac Connor
|
24c09a8207
|
Accept 0 as a value for scale meaning scale to fit
|
2020-05-08 17:55:12 -04:00 |
|
Isaac Connor
|
8195223a86
|
merge some php
|
2020-05-08 17:54:51 -04:00 |
|
Isaac Connor
|
1f6e68c129
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2020-05-08 17:26:02 -04:00 |
|
Isaac Connor
|
f101e58480
|
Split db user creation and permission granting into two commands, as needed by newer mysql. Also auto-install apache rewrite module for api.
|
2020-05-08 17:20:41 -04:00 |
|
Isaac Connor
|
3f680e11fa
|
Bump version for release
|
2020-05-01 19:23:37 -04:00 |
|
Isaac Connor
|
eca56c7123
|
Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877
|
2020-05-01 19:21:20 -04:00 |
|
Isaac Connor
|
ef540aa972
|
sun_path is defined to be 108 bytes. No need for 4095. Quiets compiler warnings
|
2020-05-01 19:13:50 -04:00 |
Joe540
|
c9f04c9136
|
Support event_close_mode for record mode
Support event_close_mode for record mode (with linked monitor)
|
2020-05-01 19:10:23 -04:00 |