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

8231 Commits

Author SHA1 Message Date
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
Isaac Connor 8d757d37a6 fix eslint 2022-01-14 16:43:59 -05:00
Jonathan Bennett 9e9bdd183c
Merge branch 'ZoneMinder:master' into janus 2022-01-14 14:05:23 -06:00
Isaac Connor 7c1ba721aa Preface Debug with ZM 2022-01-13 22:15:02 -05:00
Jonathan Bennett 212d51f933
Merge branch 'ZoneMinder:master' into janus 2022-01-13 12:16:16 -06:00
Isaac Connor 44b11389ce Merge pseudo:sandbox/ZoneMinder.connortechnology into event_thread 2022-01-13 12:00:17 -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
Jonathan Bennett 3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor 3f7e4c67a0 Provide better logging when there is no data passwed to setAlarmCues 2022-01-10 15:25:15 -05:00
Isaac Connor c8bc0661b1 Have to clear src before resetting or some browsers won't load the new image 2022-01-08 12:14:28 -05:00
Isaac Connor 71ff1e3cea Add translates for analyse button. Fixup styles 2022-01-07 16:30:14 -05:00
Isaac Connor a679455a0b Merge branch 'master' into merge_work_on_zms 2022-01-07 16:22:51 -05:00
Isaac Connor deaff43f66 use let/const 2022-01-07 16:22:24 -05:00
Isaac Connor 8f372e6a6c Add useful title to frame image telling us which we are looking at 2022-01-07 16:22:11 -05:00
Isaac Connor cfac99be4e better debugging when the row has no Id 2022-01-07 16:21:49 -05:00
Isaac Connor 79c45f50d5 define raw as an empty array so we don't generate js errors 2022-01-07 16:21:34 -05:00
Isaac Connor 038bff0df2 Add analyse button 2022-01-07 16:06:53 -05:00
Isaac Connor 1a3bee102f analyze->analyse, fixup how we show enabled/disabled and start with analysis frame displayed 2022-01-07 16:06:38 -05:00
Isaac Connor 939f165b22 rename analyze to analyse 2022-01-07 16:05:52 -05:00
Isaac Connor 7219809364 Add CMD_ANALYZE_ON/OFF 2022-01-07 14:00:36 -05:00
Isaac Connor c914f00126 browser doesn't seem to like step=0.01 
add analyze_frames button handling and update to jquery instead of mootools styles
 2022-01-07 13:59:45 -05:00
Isaac Connor 6f5eee6c0f Add show_analyze_frames function to tell zms to send analysis frames 2022-01-07 13:53:49 -05:00
Isaac Connor df0a0c7853 Add CMD_ANALYZE_ON and OFF 2022-01-07 13:50:40 -05:00
Jonathan Bennett 1333d8c751 Adds ONVIF Motion Detection Support 2022-01-06 16:45:15 -06:00
Isaac Connor e7a33a3dbe Add Importance to monitors view 2021-12-28 13:51:47 -05:00
Isaac Connor 46b95e28ec Fix commas 2021-12-28 13:51:36 -05:00
Isaac Connor 87962a3723 Invert Importance so that Normal is the auto-selected first value 2021-12-28 13:48:37 -05:00
Isaac Connor bdcb7950cd Fix export from event view due to conflict with function name in skin.js 2021-12-26 11:51:32 -05:00
Isaac Connor 80166a1ab5 Fix preset labels not being populated and causing javascript errors when they are. 2021-12-22 11:25:46 -05:00
Isaac Connor edbe726e86 Implement semaphore retry. Make not getting the semaphore an error 2021-12-17 09:41:45 -05:00
Isaac Connor c081637036 Fixes to specifying width and height of image due to us jquery. Implement changeRate/MaxFPS. Cleanup use of auth_hash in JSON. 2021-12-16 16:38:15 -05:00
Isaac Connor 4dd454325c use options[maxfps] instead of always specifying 30fps. 2021-12-16 16:36:38 -05:00
Isaac Connor 30e4d72c1d Implement CMD_MAXFPS 2021-12-16 16:36:12 -05:00
Isaac Connor 7c3ab46408 fix missing quote 2021-12-16 09:35:21 -05:00
Isaac Connor 8215b04fb0 remove padding from container in watch view so that image can go right to edge. Add 1px padding to sidebar for better visual separation. 2021-12-15 14:49:40 -05:00
Isaac Connor f1db88510e remove debug, fix eslint 2021-12-15 09:23:21 -05:00
Isaac Connor e8edeab641 parseInt prevEventId and nextEventID to be sure that our tests for != 0 work. Also don't go to previous event if prevEventId ==0.Maybe Fixes #3390 2021-12-15 09:11:55 -05:00
Isaac Connor f6d0274f74 Fix PrevCycle because monIdx was empty. 2021-12-14 17:05:56 -05:00
Isaac Connor ea671a57f8 Add skip_locked and ExecuteInterval 2021-12-13 15:01:23 -05:00
Isaac Connor 6b18b2889d Add skip_locked and ExecuteInterval 2021-12-13 15:01:17 -05:00
Isaac Connor 69faa42ca7 Add more of the resulting SQL to the filter debug modal 2021-12-13 15:00:55 -05:00
Isaac Connor 6511dc8a4f Allow empty sort field. 2021-12-13 15:00:35 -05:00
Isaac Connor 5312d11e78 Don't both running zmu if monitor Function is set to None 2021-12-10 16:08:43 -05:00
Isaac Connor 5d8db0a320 Merge cycle functionality into watch view. Add period dropdown, countdown timer, toggle the sidebar. Fix auth on statusAjax, and don't use status ajax unless we are in still mode. Apply some min-width to fps so they don't jump around. Only update their content if it has changed (fewer browser renders). 2021-12-10 15:34:35 -05:00
Isaac Connor a9ef5bf731 Add STATE_UNKNOWN and correct values of other states 2021-12-09 12:36:03 -05:00
Isaac Connor 31a1ef6cb4 Move state definitions into skin.js.php because they are used in several different views. Add STATE_UNKNOWN to match of with c++ side actual values. 2021-12-09 12:35:42 -05:00
Isaac Connor 1f78776093 Don't change colour of dot to warning when not Enabled and not doing analysis. Add reason to the dot 2021-12-06 09:48:44 -05:00
Isaac Connor 7b66d751d8 cleanup, spacing, use zone object methods to clean up svg zone layers 2021-12-05 17:49:24 -05:00
Isaac Connor 089c6044f1 Add layers toggle button, cleanup code by using ->canView, rename Monitor to monitor, add svg zones layer 2021-12-05 17:48:49 -05:00
Isaac Connor 76c4560c25 put svg zone styles in one files that can be included where needed 2021-12-05 17:46:25 -05:00
Isaac Connor e6a12d20c6 Add svg syles and rename imageFeed to videoFeed 2021-12-05 17:45:54 -05:00
Isaac Connor 45559123af Add numCoords, Coords, Area, AlarmRGB to Zone object. Also add Points(), AreaCoords, svg_polygon utility functions to it. 2021-12-05 17:45:26 -05:00
Isaac Connor 1277e75278 Detect group hierarchy loops and break them. 2021-12-03 13:25:50 -05:00
Isaac Connor 82a4cbaec5 Fix task=>action so that deleting works. Pause streaming before delete to prevent errors being logged due to missing files 2021-11-29 13:49:07 -05:00
Isaac Connor 21218491f7 Add EventStartCommand and EventEndCommand to monitors ui 2021-11-26 19:22:07 -05:00
Isaac Connor a1bf8f7f5b Fix NULL and add special 0 case for Storage area specification in filter 2021-11-26 10:35:15 -05:00
Isaac Connor 81ffc6df4e Remove text-nowrap from cause/notes column 2021-11-24 12:06:13 -05:00
Isaac Connor 46a835b28a fix error when no monitors defined and we are adding one.Fixes #3385 2021-11-22 14:26:48 -05:00
Isaac Connor 1f75b017cc kill the background timer when switching to history so that we don't cause a javascript error. comment out debugging and use native javascript instead of jquery. 2021-11-22 14:17:50 -05:00
Isaac Connor cc65c99791 Move init of ctx up before we setup the monitors. I think in some cases we can calls functions that assume ctx has a value. Uncaught%20TypeError%3A%20Cannot%20read%20properties%20of%20undefined%20(reading%20'getImageData') 2021-11-22 12:53:51 -05:00
Isaac Connor 7b18b22f82 Fix value of unknown Model 2021-11-17 18:58:02 -05:00
Isaac Connor 9160ee932f remove debug 2021-11-17 18:57:53 -05:00
Isaac Connor 836fe8c2b1 spacing 2021-11-17 18:57:44 -05:00
Isaac Connor b1d881b118 Report more saving errors to ui 2021-11-17 18:57:36 -05:00
Isaac Connor a0666e777a Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-17 17:45:47 -05:00
Isaac Connor c37d8eeded spacing and report save errors 2021-11-17 17:45:38 -05:00
Isaac Connor 7e1df53aa6 Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-17 13:52:53 -05:00
Isaac Connor 4945a016cf Restore inclusion of video files in export when not including images. Fixes #3324 2021-11-17 11:04:28 -05:00
Isaac Connor 03897bf68e Add privacy to options tabs so we can get back to it. 2021-11-16 09:49:49 -05:00
Isaac Connor 78a803abf8 Add Model and Manufacturer to telemetry listing 2021-11-16 09:47:34 -05:00
Isaac Connor 71c29afa7b Merge branch 'master' into add_manufacturer_model_to_monitors 2021-11-15 09:47:34 -05:00