Commit Graph

17344 Commits

Author SHA1 Message Date
Isaac Connor eb00cf405a Add DecodingEnabled to monitor view 2020-12-10 15:14:37 -05:00
Isaac Connor 06ecb3ccb1 Add update script to add DecodeEnabled 2020-12-10 14:39:14 -05:00
Isaac Connor 2e9f991211 give the label column in monitor view a min-width of 300px so that it is always large enough 2020-12-10 14:32:44 -05:00
Isaac Connor b12f1cce5b add Function help text to monitor view 2020-12-10 14:32:17 -05:00
Isaac Connor 66a1660423 Add missing comma 2020-12-10 14:08:01 -05:00
Isaac Connor 4667e21636 Add DecodingEnabled to Function modal 2020-12-10 14:06:40 -05:00
Isaac Connor ced396e437 Add DecodingEnabled to Monitors 2020-12-10 14:06:26 -05:00
Isaac Connor 42ab098764 Add DecodingEnabled to Monitors 2020-12-10 14:06:16 -05:00
Isaac Connor 7b1ca0e66d Use the new DecodingEnabled function 2020-12-10 14:05:57 -05:00
Isaac Connor 7f72d5399f add decoding_enabled and DecodingEnabled function 2020-12-10 14:05:46 -05:00
Isaac Connor c65e63798d Don't do decode when in RECORD OR NODECT and passthrough and no jpegs 2020-12-10 13:47:30 -05:00
Isaac Connor 37d4b3472f Add useful help for function modal describing each mode and the purpose of the Enabled checkbox 2020-12-10 13:43:28 -05:00
Andrew Bauer 9fb953bc84 set the right image attributes for frames view 2020-12-10 07:24:48 -06:00
Andrew Bauer 3a4cdb7e50 eslint 2020-12-09 20:06:38 -06:00
Andrew Bauer e0ac68786f remove unneeded thumb animation functions from frames.js 2020-12-09 18:48:58 -06:00
Andrew Bauer 39023b3e7b don't set zoom class in frames.js 2020-12-09 18:19:10 -06:00
Andrew Bauer c43ffcf58f eslint 2020-12-09 18:02:34 -06:00
Andrew Bauer 026b8cfb0c eslint 2020-12-09 17:58:46 -06:00
Isaac Connor 5482d3b3d5 Quiet error when calling logout when already logged out 2020-12-09 17:56:27 -05:00
Isaac Connor eb4b7f248d handle sort_field and limit not existing in _REQUEST 2020-12-09 17:56:27 -05:00
Isaac Connor 90bc6f723e Add HAVE_RTSP_SERVER 2020-12-09 15:04:05 -05:00
Isaac Connor 38cf667ee1 report both capture_fps and analysis_fps 2020-12-09 15:03:40 -05:00
Isaac Connor 28a3868069 report both capture_fps and analysis_fps 2020-12-09 15:03:33 -05:00
Isaac Connor c9bd09ae7b report both capture_fps and analysis_fps 2020-12-09 15:03:18 -05:00
Isaac Connor 9d43b64d4a Add debug and rtsp_server 2020-12-09 15:03:00 -05:00
Isaac Connor 03903d2dad spacing 2020-12-09 15:01:35 -05:00
Isaac Connor f54b8fff44 use mutex and condition_variable to manage signalling. Lots of debugging and fixes 2020-12-09 15:01:24 -05:00
Isaac Connor 02dd1d4cc5 Use recursive_mutex for mutex because we need to hold the lock twice 2020-12-09 15:00:57 -05:00
Isaac Connor 50e1e4391a Include capture_fps and analysis_fps in status 2020-12-09 15:00:29 -05:00
Isaac Connor 6bf5d1b5a1 Fixes to analysis_fps vs analysis_fps_limit. Fixes to logic in analysis. Make capture_fps and analysis_fps be part of shared mem. 2020-12-09 15:00:11 -05:00
Andrew Bauer 951debab7f watch.js - replace mootools ajax w/ jquery 2020-12-09 12:25:40 -06:00
Isaac Connor 282c020d86 spacing code style 2020-12-09 12:21:41 -05:00
Isaac Connor 697f9a50fe Terminate thread also when zm_terminate is true 2020-12-09 12:21:31 -05:00
Isaac Connor a3ff81b279 Add zm_rtsp_server_thread.cpp to CMakeLists.txt 2020-12-09 12:20:01 -05:00
Isaac Connor 054e1b583d Rough in code for the RTSP Server thread 2020-12-09 12:19:35 -05:00
Isaac Connor 47b3f319e7 Add capture_fps and analysis_fps to shared memory. This also requires support for type double 2020-12-09 12:18:43 -05:00
Isaac Connor d571b2dd98 Add live555 detection and HAVE_RTSP_SERVER config 2020-12-08 15:59:06 -05:00
Andrew Bauer 4e09a32836 fix one canEdit 2020-12-08 14:36:19 -06:00
Andrew Bauer 69e540c104 deploy canView and canEdit js objects 2020-12-08 14:25:48 -06:00
Isaac Connor 63c483ba92 canEditMonitors is set in skin.js.php 2020-12-08 11:27:18 -05:00
Isaac Connor 63e36340c6 Remove extra } 2020-12-08 11:26:52 -05:00
Isaac Connor 84c7a117f5 Use width and height attrs instead of css for rendering speed. Also alt doesn't need validHtmlStr because Event.Id will have no weird characters 2020-12-08 11:26:43 -05:00
Isaac Connor bfe5bb0249 Include code to handle when we are already logged in but trying to auth with a mismatched auth_hash 2020-12-08 11:19:22 -05:00
Isaac Connor c156731f0b Allow users with canView Events to view event list. Don't allow unarchive or delete if they don't have canEdit 2020-12-08 10:33:25 -05:00
Isaac Connor b0f2ff6302 Add Session cleaning 2020-12-08 10:21:55 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Isaac Connor aaf4b37439 spacing, don't need to set packet.size=0 2020-12-07 15:53:09 -05:00
Andrew Bauer 691f9a70f9 eslint 2020-12-07 14:44:45 -06:00
Andrew Bauer 1772d37c08 convert updatePresetLabels() to jquery 2020-12-07 12:32:07 -06:00
Andrew Bauer 389ad22dcd watch.js - target not $target 2020-12-07 10:36:14 -06:00