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
4e16e9052a
Merge pull request #2749 from pliablepixels/monitor_add_validation
...
add model validation so that we don't create empty monitors
2019-11-02 10:16:41 -04:00
9d8a230252
Prevent deletion of entire events directory when monitor has empty name
2019-11-02 10:12:43 -04:00
16a6938710
add model validation so that we don't create empty monitors
2019-11-02 08:30:25 -04:00
54c11bc0d1
define monitor_options as an empty array instead of php implicitly dealing with it
2019-11-01 13:42:01 -04:00
a20517a6db
spacing
2019-11-01 13:41:37 -04:00
18c13c4bad
Make chosen dropdowns 100% width on monitor edit
2019-11-01 13:40:55 -04:00
eea4cf0924
add ParentGroup to language
2019-11-01 13:40:20 -04:00
968c28395d
close group popup when saving
2019-11-01 13:39:40 -04:00
9a3bee28d2
add logging and handling of oninput and oninput-this
2019-11-01 13:38:09 -04:00
3653ad5ce3
update group editing, solving inline javascript problems and removing cruft
2019-11-01 13:37:52 -04:00
4ae1df2a8c
mention that you can't use payloads with GET
2019-11-01 10:09:32 -04:00
46991f04e6
better debugging when fail to sws_scale
2019-11-01 09:24:22 -04:00
8f327f23bd
Merge pull request #2746 from connortechnology/fix_2745
...
Fix 2745
2019-10-30 16:59:20 -04:00
e0d085d187
CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database.
2019-10-30 16:57:45 -04:00
21df2c6ac7
Always write snapshot.jpg and alarm.jpg instead of only when using video storage
2019-10-30 16:25:09 -04:00
3906999872
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2019-10-30 09:31:12 -04:00
276be8fa37
spacing and quotes
2019-10-30 09:26:17 -04:00
15d30b45c3
spacing and quotes
2019-10-30 09:25:55 -04:00
e4256ddd90
Can't use tainting as SOAP::WDSL::Factory::Transport will fail
2019-10-30 09:22:00 -04:00
6ae220f756
improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript
2019-10-29 18:06:32 -04:00
daf71aa492
improvements to layout on zones and zone
2019-10-29 18:06:03 -04:00
Isaac Connor
Isaac Connor
Pliable Pixels
Selva Nair
Martin Kask
Andrew Bauer
Isaac Connor