ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,922 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

8200 Commits

Author SHA1 Message Date
Isaac Connor 5078eecdfd Add in get_networks and get_subnets as utilities to parse devices and networks in preparation for scanning/probing 2022-02-07 12:31:31 -05:00
Isaac Connor 69053424cd When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that 2022-02-06 19:06:35 -05:00
Isaac Connor b3092f2f59 Add special handling for skip_locked, as it is a checkbox. Don't update REQUEST['Id'] on execute so we can redirect to the original filter. 2022-02-03 17:31:37 -05:00
Isaac Connor a6dc7ba0fc Add debugging, but commented out 2022-02-03 17:30:38 -05:00
Isaac Connor 3c655807e8 Use new Event->Server function to return the correct (and matching url to zms) url to use for ajax status calls. Fixes errors in a multi-server environment. 2022-02-03 14:47:32 -05:00
Isaac Connor 7a95aa7210 Don't render cues if we don't have any. This occurs on initial load we call changeScale which would re-render the cues but the cur ajax hasn't completed yet, so this just avoids an error being logged 2022-02-03 14:46:39 -05:00
Isaac Connor 7515711eb8 Implement Server function which figures out which Server likely has the video. Use it to remove duplicate logic 2022-02-03 14:45:17 -05:00
Isaac Connor 1f9e654821 Default limit to 0 which means no limit 2022-02-02 12:28:58 -05:00
Isaac Connor 3feb4fcc51
Merge branch 'master' into master 2022-02-02 12:28:17 -05:00
Isaac Connor 31eff49a46 Implement filter limits. Which go before pagination/advanced search limits 2022-02-02 10:49:05 -05:00
Isaac Connor bc4884afe5 fix replacement on escape. For some reason needs double bacl slash 2022-02-01 10:07:04 -05:00
Isaac Connor 462ec45a07 Escape newlines in config values. 2022-02-01 09:46:37 -05:00
Isaac Connor 0eb4d95d0e remove geolocation copies from config to javscript land. Now all of config is brought in my skin.js.php 2022-01-31 18:33:03 -05:00
Isaac Connor 8e62562afd Move onclick to the surrounding div instead of the img. Fixes clicking on montage 2022-01-26 21:39:29 -05:00
Isaac Connor fe8747e5e7 Make ONVIF inputs 100% 2022-01-26 11:45:07 -05:00
Jonathan Bennett 57a697093e Remove redundant JS define 2022-01-25 22:38:06 -06:00
Jonathan Bennett ec9403fb6f Adds Amcrest On-camera Motion Detection 2022-01-25 22:38:00 -06:00
Jonathan Bennett d110987935 Fix indentation for ESLint 2022-01-22 13:37:44 -06:00
Jonathan Bennett abbd27d1cb Remove hard-coded config Vars 2022-01-22 13:31:47 -06:00
Jonathan Bennett 8125aa633b
Merge branch 'ZoneMinder:master' into master 2022-01-22 12:20:13 -06:00
Isaac Connor 90f75dae93 Make config entries const 2022-01-22 12:33:48 -05:00
Isaac Connor 3a0b88c013 Don't make private config entries available to js land. 2022-01-22 12:31:36 -05:00
Isaac Connor ce2d605b3d load Private as well as Name,Value from Config 2022-01-22 12:31:15 -05:00
Isaac Connor 45db266ede Put full config available to javascript 2022-01-22 12:07:18 -05:00
Jonathan Bennett 2e9bda1af1 Add firefox specific workaround for Janus streaming 2022-01-21 23:21:41 -06:00
Jonathan Bennett 52e48c02b6 Add janus_path and janus_secret, allowing for more secure and flexible Janus installs 2022-01-21 22:23:41 -06:00
Isaac Connor 5ce701f5cb Use Monitor->getStatusHTML to generate status html 2022-01-20 11:53:44 -05:00
Isaac Connor 91d6ff2029 Use Monitor->getStatusHTML to generate status html 2022-01-20 11:53:35 -05:00
Isaac Connor 57bb91e105 add connKey to monitorData 2022-01-20 11:53:05 -05:00
Isaac Connor 9c3509a620 put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html 2022-01-20 11:52:54 -05:00
Isaac Connor e73659843a Rework to use MonitorStream.js 2022-01-20 11:52:01 -05:00
Isaac Connor 7748616992 If rate > 1600, limit it to 1600 to prevent logged errors 2022-01-20 11:51:08 -05:00
Isaac Connor 24a9dcbf47 If rate > 1600, limit it to 1600 to prevent logged errors 2022-01-20 11:50:53 -05:00
Isaac Connor 97f2c0a02b Load ajaxQueue 2022-01-20 11:50:25 -05:00
Isaac Connor 2da9c20c08 Add ajaxQueue 2022-01-20 11:49:59 -05:00
Isaac Connor 22b6337752 Merge code from watch.js. Add an ajaxQueue. Link up buttons from UI 2022-01-20 11:47:28 -05:00
Isaac Connor 4bf55b1af1 Use net zm_setcookie 2022-01-20 09:48:09 -05:00
Isaac Connor 3cd6fbdc12 Use net zm_setcookie 2022-01-20 09:48:02 -05:00
Isaac Connor 9395b7e47c Use net zm_setcookie 2022-01-20 09:47:53 -05:00
Isaac Connor a57206ef54 Implement getMonitorStateHTML to synchronize it between montage and live view, cycle etc. Reuseable code. Also the structure is required by MonitorStream.js 2022-01-20 09:47:36 -05:00
Isaac Connor db866fa668 Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it. 2022-01-20 09:46:38 -05:00
Jonathan Bennett fb832e7d1b Adds janus_enable_audio, a switch to try to enable audio in live stream viewing. 2022-01-19 00:14:52 -06:00
Isaac Connor d00aaa11e9 default JanusEnabled to 0 so that we can turn it off 2022-01-18 23:02:26 -05:00
Isaac Connor 388735e942 Fix relating auth_hash causing repeated reloads. If https, then assume a reverse proxy setup to janus. If video feed is not an img, log it and return 2022-01-18 23:02:26 -05:00
Isaac Connor 3241fa59c5 Don't redirect if there was an error so that we display it 2022-01-18 23:02:26 -05:00
Isaac Connor 90492d332c Put back to brand 3.0 of upstream 2022-01-18 10:39:24 -05:00
Isaac Connor 24c2efeb00 fix eslint 2022-01-17 16:19:27 -05:00
Jonathan Bennett 5026008482 Changes due to janus packaging 2022-01-16 19:55:53 -06:00
Jonathan Bennett 688f505f28 Adds better error handling, changes expected location of janus.js 2022-01-16 19:44:52 -06:00
Jonathan Bennett 59056b4103 Refactor Montage view js -- Janus in MonitorStream 2022-01-15 01:33:17 -06:00