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

3554 Commits

Author SHA1 Message Date
Isaac Connor 485cc26065 Merge branch 'master' into replace_function_concept 2022-02-12 22:17:47 -05:00
Isaac Connor f47aa98b43 html is not a global.. confusing yes. 2022-02-12 22:17:03 -05:00
Isaac Connor 0e2f2cf572 Merge branch 'timeline_multi_monitor' 2022-02-11 18:08:41 -05:00
Isaac Connor 94bc40a6cf Split the data by monitor and display a monitor image/info for each monitor. 2022-02-11 18:06:42 -05:00
Isaac Connor 3250e0edfe simplify some code, pass around zm_event json objects instead of event_id. Each monitor has it's own image so when loading event data put it into a div/img referenced by monitor Id 2022-02-11 18:06:08 -05:00
Isaac Connor cb80283398 Merge branch 'master' into timeline_multi_monitor 
update code to use jquery instead of mootools
when only viewing 1 monitor, split view in half
load first event image righ toff the bat
 2022-02-11 18:03:35 -05:00
Isaac Connor b700e7b5ce
Merge pull request #3424 from r01k/master 
Fixed in export.php "Class 'Filter' not found" and SQL query with wrong syntax
 2022-02-10 21:39:50 -05:00
Isaac Connor b866888062 Change title of settings button to give an indication WHY it isn't enabled 2022-02-08 17:52:59 -05:00
Isaac Connor b1d235f991 Use getBodyTopHTML so that we get error messages in UI 2022-02-08 13:33:22 -05:00
Isaac Connor d7a8947e05 Only include janus.js if needed 2022-02-08 13:33:02 -05:00
Isaac Connor f66a463574 Merge branch 'master' into replace_function_concept 2022-02-08 12:07:30 -05:00
Isaac Connor e7cd63a6ff replace Function with Recording, Analysing, Capturing 2022-02-08 11:22:41 -05:00
Isaac Connor b005927ea3 debug when no data.frames 2022-02-08 11:21:56 -05:00
Isaac Connor 01fad8a0dc Replace Function monitor filter with Capturing, Analysing, Recording filters. 2022-02-08 11:21:16 -05:00
Isaac Connor 03f6637060 Only load janus.js if we are using it 2022-02-08 11:03:25 -05:00
Isaac Connor 33473eac6a Add arp-scan as a tool for getting list of devices on network. Add an interface specifier to monitor probe just like on onvif-probe. Rough in support for Hikvision cameras 2022-02-07 12:33:53 -05:00
r01k 02d896abe2 Fixed in export.php "Class 'Filter' not found" and construction of SQL query with wrong syntax 2022-02-04 22:19:15 -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 10e39b3b13 :wqMerge branch 'master' into replace_function_concept 2022-02-02 17:08:01 -05:00
Isaac Connor 3feb4fcc51
Merge branch 'master' into master 2022-02-02 12:28:17 -05:00
Isaac Connor 3d5767b326 Merge branch 'master' into multistream 2022-02-01 16:52:42 -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 23bfbcd6ce Merge branch 'master' into multistream 2022-01-26 10:13:20 -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
Isaac Connor 4910ec752f Merge branch 'master' into multistream 2022-01-22 11:52:19 -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 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 3835087c9d Merge branch 'master' into multistream 2022-01-18 20:16:08 -05: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
Isaac Connor 8d757d37a6 fix eslint 2022-01-14 16:43:59 -05:00
Jonathan Bennett 2beffeb1b4 Add Janus to Cycle view. Remove debug Alert() messages 2022-01-12 22:47:35 -06:00
Jonathan Bennett 50c824f3bb Janus cleanup, adds support to the "watch" view 2022-01-11 21:21:58 -06:00
Jonathan Bennett 2729e1de22
Merge branch 'ZoneMinder:master' into janus 2022-01-11 10:37:29 -06:00
Isaac Connor 2a83e26fb2 Move Recording to General tab. Improve help links 2022-01-11 10:46:08 -05:00
Isaac Connor 4c16557192 When error with ajax, delay fetchImage and add logging 2022-01-11 10:45:40 -05:00
Isaac Connor 6219989884 replace function with appropriate Analysing/Capturing settings. Remove function popup. 2022-01-11 10:45:11 -05:00