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 |
|
Isaac Connor
|
1168fc52a5
|
spacing and check for permission to view the specific event instead of events in general
|
2021-10-29 18:53:23 -04:00 |
|
Isaac Connor
|
df88c5bbef
|
layout->layer
|
2021-10-28 15:28:03 -04:00 |
|
Isaac Connor
|
4122ae99a5
|
add a comment about rollbacks
|
2021-10-28 15:27:45 -04:00 |
|
Isaac Connor
|
b4314e5d46
|
Remove debugging
|
2021-10-28 15:12:24 -04:00 |
|
Isaac Connor
|
e063f0715f
|
reset starttime when changing events. Fixes super fast playback after switch to next event. Also, skip some unneeded calculations and logging.
|
2021-10-28 13:00:41 -04:00 |
|
Isaac Connor
|
dedd755e5c
|
Handle auth to mysql problems more gracefully
|
2021-10-28 12:46:42 -04:00 |
|
Isaac Connor
|
644c6e6b41
|
Just return the error
|
2021-10-28 11:48:08 -04:00 |
|
Isaac Connor
|
76b75cc69b
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2021-10-28 10:47:02 -04:00 |
|
Isaac Connor
|
fee69d3bc2
|
is no longer in existence
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
0c157904e6
|
add js to manage the generate video button
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
2a160f045d
|
Put back generate video button
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
c2bd2dc129
|
Add a warning if db queue is larger than 10
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
9fe2762bc8
|
Add mp4 as an option for generated video and make it the default instead of avi
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
5955e4b410
|
add licensing info for fontawesome.
|
2021-10-28 10:46:50 -04:00 |
|
Isaac Connor
|
d8e4a77424
|
Merge pull request #3361 from criadoperez/debian-install
Added Debian 11 (bullseye) installation instructions
|
2021-10-28 09:55:07 -04:00 |
|
Isaac Connor
|
a946c45614
|
Merge pull request #3381 from SzymekCRX/patch-1
Critical bug in events.php
|
2021-10-28 09:13:23 -04:00 |
SzymekCRX
|
2bcad7bf5e
|
Critical bug in events.php
Two extra brackets causes fatal error in Ajax request causing 500 HTTP error and problems with listing / deleting events
|
2021-10-28 07:43:44 +02:00 |