Commit Graph

8153 Commits

Author SHA1 Message Date
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