Commit Graph

16229 Commits

Author SHA1 Message Date
Andrew Bauer fb85d6f79c rough in eventdetail modal 2020-09-14 13:47:09 -05:00
Isaac Connor 691be74304 fix th text-align on tables in options 2020-09-14 14:09:41 -04:00
Isaac Connor ab8e2d2e6c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-14 14:05:02 -04:00
Isaac Connor 77fb533e48 Fix default value for AutoExecuteCmd 2020-09-14 14:04:36 -04:00
Isaac Connor e5776b79fa Introduce %EVF% Event video filename subst 2020-09-14 14:04:18 -04:00
Isaac Connor d02a61e715 change will to might 2020-09-14 14:03:55 -04:00
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 cc7b65e8aa eslint 2020-09-14 10:31:44 -05:00
Andrew Bauer d2bc39f65f replace storage popup with modal 2020-09-14 09:50:04 -05:00
Pliable Pixels 8ad62b8905 another try at fixing Eventcontroller 2020-09-13 16:43:49 -04:00
Andrew Bauer 0a0b555c4c refresh table after archive or unarchive 2020-09-13 11:32:28 -05:00
Andrew Bauer 29710f67ac fix table refresh after delete 2020-09-13 11:25:31 -05:00
Andrew Bauer c4c4551436 replace no permission alerts with enoperm() 2020-09-13 11:09:15 -05:00
Andrew Bauer 54e8d1352a add enoperm js function 2020-09-13 11:04:04 -05:00
Andrew Bauer 096f4a446f Use Ajax to load delete confirm modal 2020-09-13 10:39:51 -05:00
Andrew Bauer 7e55dd14a2 eslint 2020-09-13 08:52:52 -05:00
Andrew Bauer 951afc669f eslint 2020-09-13 08:33:47 -05:00
Andrew Bauer 1599bc4c14 load stats on deman via ajax 2020-09-13 07:32:49 -05:00
Andrew Bauer 56aa906dd8 call getStatsTableHTML in frames view 2020-09-12 11:55:24 -05:00
Andrew Bauer 5d914d8b01 convert stats table to a function 2020-09-12 11:53:53 -05:00
Andrew Bauer f31b3bfc59 add xhtmlFooter to stats view 2020-09-12 11:48:33 -05:00
Andrew Bauer 0ad41fc8d4 rough in error no permisson modal 2020-09-12 08:37:57 -05:00
Andrew Bauer 547e1d6cc4 rough in error no permisson modal 2020-09-12 08:36:19 -05:00
Andrew Bauer 0557d847f0 fix ajax archive/unarchive 2020-09-11 17:01:56 -05:00
Andrew Bauer 0c8bb25889 eslint 2020-09-11 16:49:36 -05:00
Andrew Bauer 2ee70442c0 use done() and fail() callbacks for getJSON 2020-09-11 14:30:36 -05: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 2cd9c8e232 Update api Zone Saving. Fixes #3037 2020-09-10 13:32:15 -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