Commit Graph

17179 Commits

Author SHA1 Message Date
Isaac Connor da18305729 Remove some dead code and debugging 2020-12-15 15:59:46 -05:00
Isaac Connor 39212d8ca0 Remove or increase debug level 2020-12-15 15:59:22 -05:00
Isaac Connor 48db741b4e Fix merge from master 2020-12-15 15:59:02 -05:00
Isaac Connor 8a2d4c7512 Debug the start of thread run in analysisthread. Sleep for appropriate amount of time. 2020-12-15 15:57:40 -05:00
Isaac Connor aaea6c6ead Store endtime for each packet 2020-12-15 15:57:01 -05:00
Isaac Connor de38c29e83 Fix lack of # for zoomvalue 2020-12-15 15:56:41 -05:00
Isaac Connor e123322d06 Merge branch 'master' into rtsp_server 2020-12-15 11:00:13 -05:00
Isaac Connor 99e7ae3505 Merge branch 'master' into rtsp_server 2020-12-15 10:14:19 -05:00
Isaac Connor aed83cab31 Load delconfirm content on demand 2020-12-15 10:11:30 -05:00
Isaac Connor bdf9a029ad Must require ZoneMinder::Monitor if we want to use it 2020-12-15 09:35:17 -05:00
Isaac Connor 9fec11c4a9 Add missing Monitor() function. 2020-12-14 14:41:34 -05:00
Isaac Connor bc07c38dc8 add 704x576 PAL D1 2020-12-14 12:57:59 -05:00
Andrew Bauer 191e213337 upgrade to jquery 3.5.1, use minified javascripts 2020-12-14 10:02:43 -06:00
Andrew Bauer a5b945f97a touch up event view stat list 2020-12-14 06:55:45 -06:00
Andrew Bauer 4ae47659df use js to build event stats 2020-12-13 21:19:38 -06:00
Isaac Connor 43d0b0fd55 Add D1-PAL resolution 2020-12-13 16:47:51 -05:00
Andrew Bauer 48c6309394 add emailed & archived status to event view 2020-12-13 15:01:47 -06:00
Andrew Bauer 882447317a eslint 2020-12-13 14:42:39 -06:00
Andrew Bauer c24564e0cd insert frame stats into frame view 2020-12-13 13:20:26 -06:00
Isaac Connor f544c18541 add debug testing 2020-12-12 18:53:12 -05:00
Isaac Connor 97b0ea2b73 Add missing columns to sql to load monitors. Add code to do DecodeEnabled. Handle audio packets 2020-12-12 18:52:57 -05:00
Andrew Bauer 71d1607f69 fix php -> js issue when $alarmframe was false 2020-12-12 15:06:59 -06:00
Andrew Bauer 237335c022 watch.js - finish mootools replacement 2020-12-12 12:45:36 -06:00
Andrew Bauer 2f0df74c54 show the analyse image in frames view if it exists 2020-12-12 11:37:50 -06:00
Isaac Connor 51a862057f Fix a link missing a quote 2020-12-11 09:49:43 -05:00
Isaac Connor c26fc1f36a Replace thisUrl with the export ajax request as a GET parameter, making it easier to find inlogs. 2020-12-11 09:42:35 -05:00
Isaac Connor 3483ee8db1 clean up code a little by make an event_link string and using it. Fix the cause column not being a valid link. I think it used to popup an edit but it should just go to the event view 2020-12-11 09:34:50 -05:00
Isaac Connor 77a35c1813 right align colDiskSpace so that digits line up nicely 2020-12-11 09:33:54 -05:00
Isaac Connor bfd16db34b add format padding so that right align file size strings will line up nicely. 2020-12-11 09:33:36 -05:00
Isaac Connor f89da79c27 Fix comparing empty arrays. explode on an empty string returns an array with a single element '' instead of an empty array 2020-12-10 16:25:24 -05:00
Isaac Connor 8bda0b5504 fix element name on DecodingEnabled 2020-12-10 16:24:45 -05:00
Isaac Connor c37433acfc show/hide DecodingEnabled depending on function 2020-12-10 16:24:33 -05:00
Isaac Connor da8d96ddda Don't pass types to changes, it doesn't do anything. Add DecodingEnabled to request 2020-12-10 16:24:09 -05:00
Isaac Connor f77292e6cc Move the decoding_enabled logic to constructor to save a few cycles 2020-12-10 16:23:08 -05:00
Isaac Connor 5c1135b2a7 Merge branch 'master' into no_decode 2020-12-10 15:15:32 -05:00
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