80afbbd9ce
fixup rpmspecfile cert generation
2020-12-19 08:11:20 -06:00
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
381cc30e5d
Set default value for DefaultScale to 0 which is ScaleToFit
2020-12-18 10:54:08 -05:00
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
bc03afa166
Merge branch 'rtsp_server' into zma_to_thread
2020-12-17 10:21:51 -05:00
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
08d82fb86a
use nullptr instead of 0 when init'ing event
2020-12-15 18:25:17 -05:00
6e2cfa6ca9
Add R and W short form options
2020-12-15 16:57:27 -05:00
7f9b977ec2
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:57:27 -05:00
8c85c50ce1
Add titles to fps values and only show analysis if doing it
2020-12-15 16:56:53 -05:00
997a05eb8b
AV_CODEC_ID for H264 is 27 not 220
2020-12-15 16:56:27 -05:00
7dc4633d27
rename onDownClick to onRenameClick cutnpaste error
2020-12-15 16:56:05 -05:00
b306f1b2e8
Add R and W short form options
2020-12-15 16:55:28 -05:00
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
fbbfb20c41
Move orientation setting down. output_stream hasn't been allocated yet so that would crash.
2020-12-15 16:54:35 -05:00
b7cc5dde54
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-12-15 16:50:09 -05:00
46bbbb7dff
Merge branch 'fix_zone_instead_of_ignore'
2020-12-15 16:33:58 -05:00
e9d3449929
Allow altering polygon coordinates
2020-12-15 16:32:41 -05:00
a88ccf793b
correct zone points instead of skipping zone
2020-12-15 16:32:19 -05:00
5dbe8d35ad
Debug the start of rtsp server thread run
2020-12-15 16:01:34 -05:00
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
da18305729
Remove some dead code and debugging
2020-12-15 15:59:46 -05:00
39212d8ca0
Remove or increase debug level
2020-12-15 15:59:22 -05:00
48db741b4e
Fix merge from master
2020-12-15 15:59:02 -05:00
8a2d4c7512
Debug the start of thread run in analysisthread. Sleep for appropriate amount of time.
2020-12-15 15:57:40 -05:00
aaea6c6ead
Store endtime for each packet
2020-12-15 15:57:01 -05:00
de38c29e83
Fix lack of # for zoomvalue
2020-12-15 15:56:41 -05:00
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
0702b64cc4
Merge branch 'master' into zma_to_thread
2020-12-15 10:51:40 -05:00
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
aed83cab31
Load delconfirm content on demand
2020-12-15 10:11:30 -05:00
bdf9a029ad
Must require ZoneMinder::Monitor if we want to use it
2020-12-15 09:35:17 -05:00
9fec11c4a9
Add missing Monitor() function.
2020-12-14 14:41:34 -05:00
bc07c38dc8
add 704x576 PAL D1
2020-12-14 12:57:59 -05:00
191e213337
upgrade to jquery 3.5.1, use minified javascripts
2020-12-14 10:02:43 -06:00
a5b945f97a
touch up event view stat list
2020-12-14 06:55:45 -06:00
4ae47659df
use js to build event stats
2020-12-13 21:19:38 -06:00
43d0b0fd55
Add D1-PAL resolution
2020-12-13 16:47:51 -05:00
48c6309394
add emailed & archived status to event view
2020-12-13 15:01:47 -06:00
882447317a
eslint
2020-12-13 14:42:39 -06:00
c24564e0cd
insert frame stats into frame view
2020-12-13 13:20:26 -06:00
f544c18541
add debug testing
2020-12-12 18:53:12 -05:00
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
71d1607f69
fix php -> js issue when $alarmframe was false
2020-12-12 15:06:59 -06:00
237335c022
watch.js - finish mootools replacement
2020-12-12 12:45:36 -06:00
2f0df74c54
show the analyse image in frames view if it exists
2020-12-12 11:37:50 -06:00
51a862057f
Fix a link missing a quote
2020-12-11 09:49:43 -05:00
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
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
77a35c1813
right align colDiskSpace so that digits line up nicely
2020-12-11 09:33:54 -05:00
Andrew Bauer
Isaac Connor
Isaac Connor