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 |
|
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 |