Commit Graph

14809 Commits

Author SHA1 Message Date
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
Isaac Connor 6098c4c961 properly close streams and free memory in ffmpeg_input destructor 2020-05-01 19:03:18 -04:00
Isaac Connor c5cf6e1a74 undo random addition 2020-05-01 19:01:09 -04:00
Isaac Connor 050868fad1 fix build on libavtools < 12 2020-05-01 19:00:40 -04:00
Isaac Connor 9beb5cee3a use delete[] instead of delete. 2020-05-01 18:55:48 -04:00
Isaac Connor c99db3a03f Remove some hard coded sizes, spacing and typos. Convert inputs to number inputs as appropriate 2020-05-01 18:47:10 -04:00
Isaac Connor 24aaeee155 dynamically load monitor Object when loading event data. Also dynamically load Storage, but only when the Id is different. Free the various objects in the destructor. Sync up some spacing issues with master. 2020-05-01 18:44:35 -04:00
Isaac Connor 0085e3d34f Don't warn about image for WebSite Monitors 2020-05-01 18:15:19 -04:00
Isaac Connor 2071b2a71e Guess video file name for in progress events 2020-05-01 18:14:58 -04:00
Isaac Connor 917c43a54b If can't connect to db, bail instead of loading config 2020-05-01 18:08:32 -04:00
Isaac Connor f96cc66b9d google code style 2020-05-01 18:06:27 -04:00
Isaac Connor 683bf3f982 Handle no default set for array defaults. Fixes Warning when saving WebSite type Monitors 2020-05-01 15:32:54 -04:00
Isaac Connor 9dbeaa2c7b Add default for Orientation. Fixes saving WebSite type monitors 2020-05-01 15:32:26 -04:00
Isaac Connor ffcef8a42a spacing and make sws_context static global so we don't have to keep initializing it when playing back from mp4 in eventstream. 2020-05-01 15:22:32 -04:00
Isaac Connor 1bd340d602 spacing in watch.php 2020-05-01 13:30:00 -04:00
Isaac Connor 6dbc917215 Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha 2020-05-01 13:24:47 -04:00
Isaac Connor 82188c266e Fixup Monitor->sendControlCommand. start/stop/quit should be run through zmdc.pl now instead of talking directly to zmcontrol. 2020-05-01 13:23:39 -04:00
Isaac Connor 45a445ac48 sync up index.php to master, where is a global 2020-05-01 13:21:02 -04:00
Isaac Connor ad373a5549 add Zone.php from master 2020-05-01 13:20:42 -04:00
Isaac Connor e960e638b3 Remove extra value='s from PTZ buttons. Fix remaining on-click-this on numbered presets 2020-05-01 13:07:29 -04:00
Isaac Connor bd7475a450 use on-click instead of on-click-this. We can get the button from event.target. The palemoon browser doesn't have a global event object so this wasn't working 2020-05-01 13:06:15 -04:00
Isaac Connor e29c426f04 Pass event object to data-on-click events 2020-05-01 13:04:55 -04:00
Isaac Connor 89245e0d46 Add auth relay information when auth_relay is something other than hashed. 2020-05-01 13:04:37 -04:00
Isaac Connor 2da88be307 Use auth_relay instead of auth_hash if AUTH_RELAY==plain or none. 2020-05-01 13:04:16 -04:00