Commit Graph

15985 Commits

Author SHA1 Message Date
Isaac Connor d93e9e351b Introducing a simple script that we can use in a filter to change the fps of a recording 2020-09-14 13:47:46 -04:00
Andrew Bauer 26cefda712 deploy optionhelp to option view 2020-09-11 13:23:14 -05:00
Andrew Bauer d2b2291721 deploy optionhelp to monitor view 2020-09-11 13:10:18 -05:00
Andrew Bauer aa6bf31cbd pass OLANG as a function parm 2020-09-11 07:51:00 -05:00
Andrew Bauer 4f94c63102 pass OLANG as a function parm 2020-09-11 07:50:03 -05:00
Isaac Connor 3fb62b7904 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-10 19:26:23 -04:00
Andrew Bauer 25df968f10 remove erroneous file 2020-09-10 17:29:59 -05:00
Andrew Bauer da46ab0882 eslint nanny strikes again 2020-09-10 17:11:31 -05:00
Isaac Connor 3b7bde755e
Merge pull request #3041 from mnoorenberghe/unsafe_inline_backcompat
Drop support for CSP 1 browsers (with no nonce-* support)
2020-09-10 18:09:44 -04:00
Andrew Bauer 46d4f55b80 add makeHelpLink helper function 2020-09-10 17:06:27 -05:00
Andrew Bauer cd09ec8fef rough in Modal Ajax framework 2020-09-10 16:56:58 -05:00
Matthew Noorenberghe f031ce9934 Drop support for CSP 1 browsers (with no nonce-* support)
This gets rid of console spew in modern browsers.
2020-09-10 16:25:43 -04:00
Isaac Connor e392b417e3
Merge pull request #3039 from mnoorenberghe/monitor_function_disabled
Show correct enabled/disabled status in the function dialog
2020-09-10 15:57:44 -04:00
Matthew Noorenberghe 46e69f8c27 Show correct enabled/disabled status in the function dialog
monitor.Enabled is a string and 0 is truthy in JS
2020-09-10 15:12:31 -04:00
Isaac Connor 7dbbb24db4 Update api Zone Saving. Fixes #3037 2020-09-10 13:31:39 -04:00
Isaac Connor 2e5a897355
Merge pull request #3038 from mnoorenberghe/fix_function_save
Fix saving function changes
2020-09-10 11:52:38 -04:00
Isaac Connor e37c5ac385 Use FrameId instead of FramesId 2020-09-10 11:10:19 -04:00
Isaac Connor 4dc00ebe09 spacing, only add extra sort by Id column if we aren't already sorting by Id 2020-09-10 11:05:22 -04:00
Isaac Connor 1f837c1718 Hide eventId not FrameId 2020-09-10 11:04:18 -04:00
Matthew Noorenberghe f046b565c6 Fix saving function changes
Wait for the request to complete before reloading.
2020-09-10 11:01:44 -04:00
Isaac Connor 013e007141 run parseRows on init so that datetime fields get their popups etc 2020-09-09 15:40:44 -04:00
Isaac Connor d843ef89f6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-09 15:07:46 -04:00
Isaac Connor 30e9924601 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-09 12:55:13 -04:00
Isaac Connor 53fe4c7f1b Handle error conditions 2020-09-09 12:55:08 -04:00
Isaac Connor a4b83b0e99 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-09-09 12:13:54 -04:00
Isaac Connor 6bfd7c5e14 log referer when unable to authenticate 2020-09-09 12:13:28 -04:00
Isaac Connor 7b52237593 spacing and correct a libvlc=>libvncclient 2020-09-09 10:25:55 -04:00
Isaac Connor af84533603 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-08 11:01:19 -04:00
Isaac Connor 5d6f57a3d5 Use HTML comments to remove templating from submitted bug reports. 2020-09-08 11:01:05 -04:00
Isaac Connor b34c6dcfc2 correct log, code docs 2020-09-07 13:29:36 -04:00
Isaac Connor 74dc8af76f add global 2020-09-07 13:29:21 -04:00
Isaac Connor fc06b440ad remove debug 2020-09-07 13:28:55 -04:00
Isaac Connor eadd9dd4f4 spacing 2020-09-07 13:28:45 -04:00
Isaac Connor 4126f96b40 clean up sendFrame a bit introducing send_file and send_buffer utility functions 2020-09-07 11:19:47 -04:00
Isaac Connor 1659bb2116 Add id to scale dropdown 2020-09-06 12:12:26 -04:00
Isaac Connor f063d4673b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-05 17:33:23 -04:00
Isaac Connor 034bee9bb2 fix errors due to selects no longer having an id by default 2020-09-05 17:33:17 -04:00
Isaac Connor d0d945a04c
Merge pull request #3035 from zemsten/patch-1
Update debian.rst
2020-09-05 16:04:23 -04:00
zemsten eedd677a60
Update debian.rst
Updated debian buster instructions to be version independent for php, updated mysql package, included gnupg, added tee commands for easy one-liners.
2020-09-05 10:21:35 -07:00
Isaac Connor c5e4a964cd quotes, spacing fix some functions that clearly no one uses 2020-09-05 12:49:14 -04:00
Isaac Connor 23505159da put scale code together with itself. Get rid of unneeded generateConnKey 2020-09-05 12:23:00 -04:00
Isaac Connor d1dc3d6864 remove Error debug 2020-09-05 09:45:44 -04:00
Isaac Connor b3b6445d60 Fix application of scales to montage streams 2020-09-05 09:15:33 -04:00
Isaac Connor bf895f8f12 Make Zones a link to view/edit all zones 2020-09-05 09:15:09 -04:00
Isaac Connor 778fdb9ab0 fix lack of id's on width,height,scale dropdowns making their selection break 2020-09-05 08:56:00 -04:00
Isaac Connor 7e6fbe1ab4 Fix ControlTypes dropdown. 2020-09-05 08:46:18 -04:00
Isaac Connor 62f78bfeb7 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-04 14:58:48 -04:00
Isaac Connor ae56a1f363 Turn off output buffering in view_video 2020-09-04 14:58:43 -04:00
Isaac Connor 1d94424d78
Merge pull request #3034 from mnoorenberghe/event_back_3033
Specify a function name for data-on-click to fix the Back/Close button for Events.
2020-09-04 10:41:44 -04:00
Matthew Noorenberghe bd829f8aa1 Specify a function name for data-on-click to fix the Back/Close button for Events. Fixes #3033 2020-09-04 10:25:05 -04:00