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

17565 Commits

Author SHA1 Message Date
Andrew Bauer 12c2a0d4e3
Update redhat.rst 2020-12-19 11:11:34 -06:00
Andrew Bauer 2095bb57e5
Update redhat.rst 2020-12-19 11:09:22 -06:00
Andrew Bauer e1ef0f4bcc
Update redhat.rst 2020-12-19 11:02:15 -06:00
Andrew Bauer f0b1eac823
Update redhat.rst 2020-12-19 10:59:14 -06:00
Andrew Bauer cc2eda3519
Update redhat.rst 2020-12-19 10:57:44 -06:00
Andrew Bauer d5bb2022ed
Update redhat.rst 2020-12-19 10:55:37 -06:00
Andrew Bauer 0a2195d9fd
Update redhat.rst 2020-12-19 10:54:53 -06:00
Andrew Bauer b76b84f51f
Update redhat.rst 2020-12-19 10:52:20 -06:00
Andrew Bauer 952da2217d
Update redhat.rst 2020-12-19 10:49:21 -06:00
Andrew Bauer f9d25d6dca
Update redhat.rst 2020-12-19 10:47:53 -06:00
Andrew Bauer d7596d448e
Update redhat.rst 2020-12-19 10:44:34 -06:00
Andrew Bauer 96ade2f9d0 update rpm nginx readme 2020-12-19 10:09:12 -06:00
Andrew Bauer 80afbbd9ce fixup rpmspecfile cert generation 2020-12-19 08:11:20 -06:00
Isaac Connor 2936d64b91 Always take ownership of dirs in /var/cache/zoneminder. The previous behaviour would have only done it on a new install. Fixes #3096 2020-12-18 10:54:08 -05:00
Isaac Connor 381cc30e5d Set default value for DefaultScale to 0 which is ScaleToFit 2020-12-18 10:54:08 -05:00
Isaac Connor 0104e2ba7f Add a sorted_monitor_ids array to use when generating sorted lists of monitors. Return proper json when things aren't set instead of empty string. Use sorted_monitor_ids to populate the monitor dropdown in filters 2020-12-18 10:23:41 -05:00
Isaac Connor bc03afa166 Merge branch 'rtsp_server' into zma_to_thread 2020-12-17 10:21:51 -05:00
Isaac Connor 8d52baeee2 Merge branch 'master' into rtsp_server 
Cleanup Analysis a bit. We can't skip packets just because they are audio. Clean up the state machine transitions a bit to make them a little more readable.
Change logic of PrimeCapture, success MUST return 1.  0 means no error but also no success.
Debugging and braces improvements in local_camera.
 2020-12-17 10:16:54 -05:00
Isaac Connor a855656b88 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-12-17 09:27:23 -05:00
Isaac Connor 5602b92699 Fix issue with timeline where it only shows first frame 2020-12-17 09:26:59 -05:00
Isaac Connor 08d82fb86a use nullptr instead of 0 when init'ing event 2020-12-15 18:25:17 -05:00
Isaac Connor 6e2cfa6ca9 Add R and W short form options 2020-12-15 16:57:27 -05:00
Isaac Connor 7f9b977ec2 rename onDownClick to onRenameClick cutnpaste error 2020-12-15 16:57:27 -05:00
Isaac Connor 8c85c50ce1 Add titles to fps values and only show analysis if doing it 2020-12-15 16:56:53 -05:00
Isaac Connor 997a05eb8b AV_CODEC_ID for H264 is 27 not 220 2020-12-15 16:56:27 -05:00
Isaac Connor 7dc4633d27 rename onDownClick to onRenameClick cutnpaste error 2020-12-15 16:56:05 -05:00
Isaac Connor b306f1b2e8 Add R and W short form options 2020-12-15 16:55:28 -05:00
Isaac Connor 89eacbc8a8 NODECT needs an analysis thread to check for triggers and linked monitors. Turn off RTSP for now 2020-12-15 16:55:12 -05:00
Isaac Connor fbbfb20c41 Move orientation setting down. output_stream hasn't been allocated yet so that would crash. 2020-12-15 16:54:35 -05:00
Isaac Connor b7cc5dde54 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-15 16:50:09 -05:00
Isaac Connor 46bbbb7dff Merge branch 'fix_zone_instead_of_ignore' 2020-12-15 16:33:58 -05:00
Isaac Connor e9d3449929 Allow altering polygon coordinates 2020-12-15 16:32:41 -05:00
Isaac Connor a88ccf793b correct zone points instead of skipping zone 2020-12-15 16:32:19 -05:00
Isaac Connor 5dbe8d35ad Debug the start of rtsp server thread run 2020-12-15 16:01:34 -05:00
Isaac Connor a502a86b00 Instead of pointing analsysis_it to begin, point it to the end, which is the newly pushed packet. Add back queue clearing 2020-12-15 16:01:18 -05:00
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 0702b64cc4 Merge branch 'master' into zma_to_thread 2020-12-15 10:51:40 -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