Isaac Connor
|
4be9c6cdd2
|
Code comments and make warning when the first packet in queue is locked.
|
2021-11-24 12:42:31 -05:00 |
Isaac Connor
|
81ffc6df4e
|
Remove text-nowrap from cause/notes column
|
2021-11-24 12:06:13 -05:00 |
Isaac Connor
|
ffdb0f9824
|
If we are starting a process that is waiting to term, mark it to get started by the reaper. Fixes case where zmdc thought the process was still running and so didn't start it. We never noticed because zmwatch would eventually notice. The result is instant restart.
|
2021-11-23 11:05:39 -05:00 |
Isaac Connor
|
46a835b28a
|
fix error when no monitors defined and we are adding one.Fixes #3385
|
2021-11-22 14:26:48 -05:00 |
Isaac Connor
|
1f75b017cc
|
kill the background timer when switching to history so that we don't cause a javascript error. comment out debugging and use native javascript instead of jquery.
|
2021-11-22 14:17:50 -05:00 |
Isaac Connor
|
cc65c99791
|
Move init of ctx up before we setup the monitors. I think in some cases we can calls functions that assume ctx has a value. Uncaught%20TypeError%3A%20Cannot%20read%20properties%20of%20undefined%20(reading%20'getImageData')
|
2021-11-22 12:53:51 -05:00 |
Isaac Connor
|
40e7f607f5
|
If no protocol defined, fall back to the name of the Control
|
2021-11-22 11:38:40 -05:00 |
Isaac Connor
|
2529765df3
|
timestamp image before scaling. Fixes lack of scaling when TIMESTAMP_ON_CAPTURE
is off
|
2021-11-19 11:59:19 -05:00 |
Isaac Connor
|
2c798069d3
|
improve debug logging when loading Control in Monitor
|
2021-11-18 18:12:07 -05:00 |
Isaac Connor
|
0a30c55042
|
install manufacturers.sql and models.sql
|
2021-11-18 11:09:49 -05:00 |
Isaac Connor
|
6ee3c238e7
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-18 09:55:51 -05:00 |
Isaac Connor
|
f63c124988
|
include manufacturers and models
|
2021-11-18 09:55:39 -05:00 |
Isaac Connor
|
18610fd601
|
Add an update script that includes manufacturers and models
|
2021-11-18 09:55:19 -05:00 |
Isaac Connor
|
805ef16e73
|
bump version
|
2021-11-17 18:59:37 -05:00 |
Isaac Connor
|
7b18b22f82
|
Fix value of unknown Model
|
2021-11-17 18:58:02 -05:00 |
Isaac Connor
|
9160ee932f
|
remove debug
|
2021-11-17 18:57:53 -05:00 |
Isaac Connor
|
836fe8c2b1
|
spacing
|
2021-11-17 18:57:44 -05:00 |
Isaac Connor
|
b1d881b118
|
Report more saving errors to ui
|
2021-11-17 18:57:36 -05:00 |
Isaac Connor
|
a0666e777a
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-17 17:45:47 -05:00 |
Isaac Connor
|
c37d8eeded
|
spacing and report save errors
|
2021-11-17 17:45:38 -05:00 |
Isaac Connor
|
96b4af6255
|
Enable multi-threading on decode
|
2021-11-17 14:43:13 -05:00 |
Isaac Connor
|
7e1df53aa6
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-17 13:52:53 -05:00 |
Isaac Connor
|
4945a016cf
|
Restore inclusion of video files in export when not including images. Fixes #3324
|
2021-11-17 11:04:28 -05:00 |
Isaac Connor
|
03897bf68e
|
Add privacy to options tabs so we can get back to it.
|
2021-11-16 09:49:49 -05:00 |
Isaac Connor
|
78a803abf8
|
Add Model and Manufacturer to telemetry listing
|
2021-11-16 09:47:34 -05:00 |
Isaac Connor
|
20629fdf5a
|
Include Manufacturer and Model in telemetry
|
2021-11-16 09:20:14 -05:00 |
Isaac Connor
|
f48511acba
|
Add NULL for ModelId column when adding MonitorPresets.
|
2021-11-16 09:19:42 -05:00 |
Isaac Connor
|
6cbc4c0a7a
|
Update MonirorPresets to link to Amcrest cams
|
2021-11-15 16:30:39 -05:00 |
Isaac Connor
|
4e9a56624d
|
Use UPSERTS and add some more models
|
2021-11-15 16:30:17 -05:00 |
Isaac Connor
|
e63222d733
|
Add IGNORE so it does UPSERT
|
2021-11-15 16:30:03 -05:00 |
Isaac Connor
|
71c29afa7b
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-15 09:47:34 -05:00 |
Isaac Connor
|
d00430f799
|
Add ModelId to MonitorPresets
|
2021-11-15 09:47:11 -05:00 |
Isaac Connor
|
c84f42e280
|
Set to never timeout while generating video
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
e35dc3902e
|
Make state enum start at 0 as we are indexing into an array for StateStrings
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
d94c100a72
|
Use event->StartTime instead of GetVideoWriterStartTime. Add some parenthesis to make logic clearer and add more info to debug statements
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
8872b8be63
|
spacing
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
795c5bb7d7
|
setScale to auto
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
ac03a88550
|
Include url_to_zms in monitorData
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
529e889d99
|
remove extra ,
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
14e578cdb2
|
Implement Exit Fullscreen using same button
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
a7fd65d844
|
Put SCALE_BASE in skin.js.php as it is used in many places.
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
6f3e22f2a0
|
If no bottom element is specified, take the last child of content in scaleToFit
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
8d0463bbff
|
Implement getElement, setScale in MonitorStream.js
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
98e29e7ef6
|
implement UrlToZMS in Monitor
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
9d37fbcd8e
|
Fix some build warnings on arm
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
dc9f7b4d1d
|
Rough in fullscreen mode on montage
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
acff4fb9c0
|
rough in fullscreen mode in watch view
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
c76e688f05
|
Don't exit(0) on QUIT. Instead set zm_terminate=true so that all the cleanup routines run.
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
53c57478b8
|
Ignore versioned bootstrap
|
2021-11-12 15:11:48 -05:00 |
Isaac Connor
|
82a26a1f83
|
use != Monitor instead of all the other cases
|
2021-11-12 15:11:48 -05:00 |