286a5a72a3
Merge branch 'master' into zma_to_thread
2020-12-23 09:47:31 -05:00
c497b94378
use tlzoom class to avoid conflict with thumbnail zoom
2020-12-23 07:57:44 -06:00
a9b92905ca
eslint
2020-12-22 19:07:12 -06:00
a1917d83d0
Merge branch 'master' into zma_to_thread
2020-12-22 19:52:09 -05:00
cc5a732103
continue work on timeline.js
2020-12-22 16:06:21 -06:00
6be9b294ef
Hidden and hidden are two very different classes
2020-12-22 17:00:07 -05:00
8a26252914
update object detected link in events
2020-12-22 12:42:27 -06:00
9af383db92
set the width style for the objdetect modal
2020-12-22 12:30:44 -06:00
ee45916526
move objdetect image to a modal
2020-12-22 10:08:31 -06:00
a231125fb3
Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link
2020-12-22 10:23:44 -05:00
cbe04674c5
remove non-existent id preview
2020-12-21 15:59:05 -06:00
d080109f4b
eslint
2020-12-21 15:20:38 -06:00
663748d9a7
partial replace mootools
2020-12-21 13:07:14 -06:00
1f3fd93296
use setTimeout instead of mootools pass
2020-12-20 15:21:38 -06:00
92361210ce
eslint
2020-12-20 15:07:16 -06:00
1d6c4664dc
replace mootools in export
2020-12-20 10:54:18 -06:00
0b569e7e37
replace mootools in control.js
2020-12-20 08:29:39 -06:00
66ae2c0461
replace mootools request JSON
2020-12-20 07:59:17 -06: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
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
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
48db741b4e
Fix merge from master
2020-12-15 15:59:02 -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
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
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
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
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
8bda0b5504
fix element name on DecodingEnabled
2020-12-10 16:24:45 -05:00
c37433acfc
show/hide DecodingEnabled depending on function
2020-12-10 16:24:33 -05:00
5c1135b2a7
Merge branch 'master' into no_decode
2020-12-10 15:15:32 -05:00
eb00cf405a
Add DecodingEnabled to monitor view
2020-12-10 15:14:37 -05:00
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
b12f1cce5b
add Function help text to monitor view
2020-12-10 14:32:17 -05:00
66a1660423
Add missing comma
2020-12-10 14:08:01 -05:00
Isaac Connor
Andrew Bauer