Isaac Connor
|
a0215067e4
|
In multi-server when viewing an event it may be coming from a different server than the serverhost. Use monitorUrl instead of thisUrl in ajax calls and include auth data. Fixes failed ajax when viewing h264 using zms on a multi-server environment
|
2021-11-11 13:58:52 -05:00 |
|
Isaac Connor
|
883772295d
|
spacing and log the new log level string as well as number
|
2021-11-11 13:51:17 -05:00 |
|
Isaac Connor
|
6cd1f6b5f3
|
Fix memleak on event creation due to not freeing storage object
|
2021-11-11 13:50:18 -05:00 |
|
Isaac Connor
|
dc756ad670
|
add back update for Manufacturers and Models
|
2021-11-10 19:20:39 -05:00 |
|
Isaac Connor
|
9d71f1192a
|
merge manufacturer update into existing zm_update-1.37.2 and then move it to .in
|
2021-11-10 19:18:16 -05:00 |
|
Isaac Connor
|
721769993b
|
Set to never timeout while generating video
|
2021-11-10 17:05:46 -05:00 |
|
Isaac Connor
|
8d85d0f640
|
Make state enum start at 0 as we are indexing into an array for StateStrings
|
2021-11-10 16:53:29 -05:00 |
|
Isaac Connor
|
5ac9f88d00
|
Use event->StartTime instead of GetVideoWriterStartTime. Add some parenthesis to make logic clearer and add more info to debug statements
|
2021-11-10 16:53:07 -05:00 |
|
Isaac Connor
|
2c0c257d76
|
spacing
|
2021-11-10 14:25:45 -05:00 |
|
Isaac Connor
|
0732d4c1b3
|
setScale to auto
|
2021-11-10 14:25:29 -05:00 |
|
Isaac Connor
|
377219befe
|
Include url_to_zms in monitorData
|
2021-11-10 14:25:12 -05:00 |
|
Isaac Connor
|
ed84b59671
|
remove extra ,
|
2021-11-10 14:23:36 -05:00 |
|
Isaac Connor
|
5d0bd978e4
|
Implement Exit Fullscreen using same button
|
2021-11-10 14:22:05 -05:00 |
|
Isaac Connor
|
43c1886267
|
Put SCALE_BASE in skin.js.php as it is used in many places.
|
2021-11-10 14:21:38 -05:00 |
|
Isaac Connor
|
b8f6172110
|
If no bottom element is specified, take the last child of content in scaleToFit
|
2021-11-10 14:21:12 -05:00 |
|
Isaac Connor
|
474f65cff3
|
Implement getElement, setScale in MonitorStream.js
|
2021-11-10 14:20:19 -05:00 |
|
Isaac Connor
|
4c2d50c1f4
|
implement UrlToZMS in Monitor
|
2021-11-10 14:18:58 -05:00 |
|
Isaac Connor
|
44d88edbbb
|
Fix some build warnings on arm
|
2021-11-09 17:01:13 -05:00 |
|
Isaac Connor
|
f263da8986
|
Rough in fullscreen mode on montage
|
2021-11-09 17:01:13 -05:00 |
|
Isaac Connor
|
30d4900b45
|
rough in fullscreen mode in watch view
|
2021-11-09 17:01:13 -05:00 |
|
Isaac Connor
|
508be72e08
|
Don't exit(0) on QUIT. Instead set zm_terminate=true so that all the cleanup routines run.
|
2021-11-09 15:49:44 -05:00 |
|
Isaac Connor
|
96a58f8c88
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-09 14:00:25 -05:00 |
|
Isaac Connor
|
66517218f1
|
Ignore versioned bootstrap
|
2021-11-09 14:00:04 -05:00 |
|
Isaac Connor
|
5d23362ae0
|
use != Monitor instead of all the other cases
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
38105c6796
|
Spacing
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
7aefd657c7
|
Cleanup and spacing. Rework last_motion_score to be a bit more efficient and use fewer lines. Fix case where MOCORD was not ending/starting event on alarm.
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
7abbfc2fb5
|
alert error message is an error is returned instead of rows
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
e617eb8615
|
Whitespace
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
ce81099489
|
Report error if sql fails. Add check for access to specific event.
|
2021-11-09 13:59:14 -05:00 |
|
Isaac Connor
|
8c2dec03b6
|
Default to now instead of ... epoch? when endtime is null. Fixes video playing when event is incomplete
|
2021-11-09 13:59:14 -05:00 |
Isaac Connor
|
6609c154f2
|
Pretty up the v4l field names
|
2021-11-07 11:28:34 -05:00 |
|
Isaac Connor
|
f737e3e945
|
Only list available ids if there are some
|
2021-11-06 09:58:31 -04:00 |
|
Isaac Connor
|
1fd99424bb
|
Merge branch 'master' into add_manufacturer_model_to_monitors
|
2021-11-05 10:13:41 -04:00 |
|
Isaac Connor
|
b2d9e5608f
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-03 17:08:59 -04:00 |
|
Isaac Connor
|
364ae03195
|
Set zm_terminate on crash so that other threads exit instead of continuing
|
2021-11-03 17:04:13 -04:00 |
|
Isaac Connor
|
0119ff46aa
|
Remove redundant debug
|
2021-11-03 17:03:54 -04:00 |
|
Isaac Connor
|
93055f44e8
|
Merge UpdateCaptureFPS and UpdateAnalysisFPS into UpdateFPS and call it from zmc after capture.
|
2021-11-03 17:03:29 -04:00 |
|
Isaac Connor
|
814eca2b4f
|
Include the codec in the resulting mp4 filename. Remove event update setting the mp4 filename after insert, do it on event completing instead. Saves 1 db update.
|
2021-11-03 17:02:02 -04:00 |
|
Isaac Connor
|
a799eb3ad9
|
add function get_codec to return the codec used in the output mp4
|
2021-11-03 17:01:11 -04:00 |
|
Isaac Connor
|
b26ce4378d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-02 18:00:24 -04:00 |
|
Isaac Connor
|
5f27c124c3
|
Ignore bootstrap-4.5.0.js
|
2021-11-02 18:00:18 -04:00 |
|
Isaac Connor
|
ae4a33beb2
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-11-02 17:40:37 -04:00 |
|
Isaac Connor
|
3208059040
|
Fix event listing when not paginated.
|
2021-11-02 17:24:05 -04:00 |
|
Isaac Connor
|
8619971864
|
Better debug messages
|
2021-11-02 17:24:05 -04:00 |
|
Isaac Connor
|
61f7989bec
|
Actually report the # of dbQueue entries
|
2021-11-02 17:24:05 -04:00 |
|
Isaac Connor
|
dd949bb129
|
av_write_trailer can return a positive value which is not an error
|
2021-11-02 17:10:02 -04:00 |
|
Isaac Connor
|
0e3f694097
|
Rename bootstrap with version so we don't have to cache bust it, so that .map loading works.
|
2021-10-31 15:19:26 -04:00 |
|
Isaac Connor
|
97164fd4d7
|
Fix use of thisUrl instead of monitorUrl when getting stream status. Fix changing stream image due to use of jquery.
|
2021-10-31 14:44:36 -04:00 |
|
Isaac Connor
|
3f0bdf6332
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-10-29 18:54:47 -04:00 |
|
Isaac Connor
|
224b34d69d
|
Send all stats rows instead of just 1. Handle receiving all rows, and don't list event id and frame id
|
2021-10-29 18:54:23 -04:00 |