cbe1d7a440
Merge pull request #2759 from pliablepixels/mem_typo
...
typo fix
2019-11-21 12:30:48 -05:00
722a74e038
typo fix
2019-11-21 11:16:13 -05:00
f1ec455665
Add some debug to logrot
2019-11-21 10:49:23 -05:00
1c51c695d9
Remove printMsg, it will be inherited
2019-11-21 10:49:04 -05:00
e215a6661d
Google code style updates, better quotes
2019-11-21 10:45:18 -05:00
606c89962f
eliminate an extra db call
2019-11-20 16:30:26 -05:00
19d4a2287f
When restarting, if the process was already dead, we won't restart it. So add a start call. Fixes #2757
2019-11-20 14:22:12 -05:00
0648fbf0ca
clean up the zmrepo key stuff
2019-11-20 14:21:12 -05:00
0f8d2faa6f
Just use return code from rsync. We don't mind it's verbose output being always output.
2019-11-20 14:21:01 -05:00
65222ff726
put back ssh_known_hosts add-on since the other hack doesn't seem to be working
2019-11-20 13:06:30 -05:00
d1458108f4
Add dimensions wrong check. Add bytes count
2019-11-20 12:43:17 -05:00
9d4c802b48
netEmpty is deprecated. Use notBlank instead
2019-11-20 09:32:19 -05:00
5feeedf7f4
Mostly spacing, but Event doesn't have DefaultScale, that comes from Monitor
2019-11-20 09:31:58 -05:00
5494fdb087
When upgrading from a version that doesn't do DiskSpace storage, there can be a lot of events to update. Can't load them all or we run out of ram. Batch them in 1000's
2019-11-20 09:31:16 -05:00
ac96a19371
Fix filtering monitors by user's MonitorId restriction
2019-11-19 17:21:01 -05:00
207e5918c8
fix lint, remove debug
2019-11-19 11:37:45 -05:00
e4c23c3100
crank of the verbosity. Add another rsync call just to test if output is not being reported to travis
2019-11-19 09:36:43 -05:00
61e27bcb29
Use ecdsa key instead of rsa. Apparently ecdsa is the new correct default.
2019-11-19 09:11:53 -05:00
7868d969ce
add -v to rsync
2019-11-18 17:59:10 -05:00
d9e3f21ba1
Turn off controlmaster to see if that is what is causing us trouble with rsync
2019-11-18 17:02:30 -05:00
627adf5a1f
do the .deb installation and test on xenial instead of trusty
2019-11-18 14:35:26 -05:00
efdba5a50f
add ssh -v to rsync command so we can figure out why it isn't working
2019-11-18 14:31:32 -05:00
ffc09a58ce
remove extra install
2019-11-18 13:49:13 -05:00
0e626c6585
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-18 13:43:50 -05:00
16cea4b65a
remove MIM attack possibility by specifying the host key to use for zmrepo.zoneminder.com. Might also solve travis deploy problems
2019-11-18 13:43:44 -05:00
f90c1817c5
Merge pull request #2754 from pliablepixels/doc-fix
...
add note on API wrapper
2019-11-17 16:51:03 -05:00
1a72b5b9fe
add note on API wrapper
2019-11-17 15:56:41 -05:00
5260563ec4
Update frame deltas in the database to be relative to the video start time
...
Currenltly the frames written to database have delta time measured
from the event start time. As these deltas are also used to generate
any frame on the fly from the recorded video, these should be relative
to the video start time.
Adjust by subtracting the offset of the video start from event start.
Done when the event is closed.
If video is not stored, this has no effect.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
dd31279ca3
Fix the recorded video start time
...
The event start time already includes the duration of the
pre_event frames. Do not back track the video by a further
pre_event_count.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
2e7fad68d1
Properly compute video buffer length when analysis fps is set
...
Currently the number of video frames kept in the buffer is set as the
pre_event_count. This falls short when the capture fps is larger
than the analysis fps. Fix by computing the retained video duration
as pre_event_count/analysis_fps
No change if analysis fps is not set.
Signed-off-by: Selva Nair <selva.nair@gmail.com>
2019-11-15 21:55:40 -05:00
c3250dea00
fix typos and add some more text
2019-11-15 15:20:07 -05:00
79c1047bcf
Merge pull request #2752 from Tsopic/storage-docs
...
Add storage docs
2019-11-15 15:13:41 -05:00
98a1cb8c29
Add storage docs
2019-11-14 08:00:52 +02:00
fdf5150a16
fix build on jessie
2019-11-13 13:51:22 -05:00
070fe467d5
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-11 13:34:23 -05:00
59b9220ddd
if doing multiport still call Url(), as it requires a hostname
2019-11-11 13:33:54 -05:00
be970cce04
Update .travis.yml
2019-11-10 15:19:03 -06:00
c1913cdbc4
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-10 15:49:49 -05:00
56618aac32
Handle buttons not existing
2019-11-10 15:49:39 -05:00
ebcdbdd945
Update .travis.yml
2019-11-08 15:03:34 -06:00
bcc9bb8cd3
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-08 15:18:26 -05:00
1c54f22627
Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to.
2019-11-08 15:18:08 -05:00
e479bbd06c
Merge pull request #2743 from pliablepixels/1_34_docs
...
1 34 docs update
2019-11-08 13:16:06 -05:00
02621f9e49
Add fedora 30 and 31
2019-11-07 16:21:31 -05:00
8d75cba444
quotes, spacing. Fix closing events on monitors other than the specified on the command line monitor
2019-11-06 20:58:07 -05:00
24cc45b3e8
Cleanup, handle warnings when output of command is undef
2019-11-06 17:20:24 -05:00
014ce0afe8
improve error message regarding timezone differences
2019-11-05 12:40:11 -05:00
5b02bc76f4
Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly
2019-11-05 10:07:42 -05:00
5603fd70f8
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-11-04 12:04:37 -05:00
d218d2ee9f
If the default server case, don't add the Url component. So this will return just the path, using whatever servername/port combo is currently in use. Fixes #2750
2019-11-04 12:04:23 -05:00
Isaac Connor
Pliable Pixels
Isaac Connor
Selva Nair
Martin Kask
Andrew Bauer
Isaac Connor