ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,159 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

14159 Commits

Author SHA1 Message Date
Selva Nair 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
Isaac Connor c3250dea00 fix typos and add some more text 2019-11-15 15:20:07 -05:00
Isaac Connor 79c1047bcf
Merge pull request #2752 from Tsopic/storage-docs 
Add storage docs
 2019-11-15 15:13:41 -05:00
Martin Kask 98a1cb8c29 Add storage docs 2019-11-14 08:00:52 +02:00
Isaac Connor fdf5150a16 fix build on jessie 2019-11-13 13:51:22 -05:00
Isaac Connor 070fe467d5 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-11 13:34:23 -05:00
Isaac Connor 59b9220ddd if doing multiport still call Url(), as it requires a hostname 2019-11-11 13:33:54 -05:00
Andrew Bauer be970cce04
Update .travis.yml 2019-11-10 15:19:03 -06:00
Isaac Connor c1913cdbc4 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-10 15:49:49 -05:00
Isaac Connor 56618aac32 Handle buttons not existing 2019-11-10 15:49:39 -05:00
Andrew Bauer ebcdbdd945
Update .travis.yml 2019-11-08 15:03:34 -06:00
Isaac Connor bcc9bb8cd3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-08 15:18:26 -05:00
Isaac Connor 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
Isaac Connor e479bbd06c
Merge pull request #2743 from pliablepixels/1_34_docs 
1 34 docs update
 2019-11-08 13:16:06 -05:00
Isaac Connor 02621f9e49 Add fedora 30 and 31 2019-11-07 16:21:31 -05:00
Isaac Connor 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
Isaac Connor 24cc45b3e8 Cleanup, handle warnings when output of command is undef 2019-11-06 17:20:24 -05:00
Isaac Connor 014ce0afe8 improve error message regarding timezone differences 2019-11-05 12:40:11 -05:00
Isaac Connor 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
Isaac Connor 5603fd70f8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-11-04 12:04:37 -05:00
Isaac Connor 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 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
Isaac Connor 9d8a230252 Prevent deletion of entire events directory when monitor has empty name 2019-11-02 10:12:43 -04:00
Pliable Pixels 16a6938710 add model validation so that we don't create empty monitors 2019-11-02 08:30:25 -04:00
Isaac Connor 54c11bc0d1 define monitor_options as an empty array instead of php implicitly dealing with it 2019-11-01 13:42:01 -04:00
Isaac Connor a20517a6db spacing 2019-11-01 13:41:37 -04:00
Isaac Connor 18c13c4bad Make chosen dropdowns 100% width on monitor edit 2019-11-01 13:40:55 -04:00
Isaac Connor eea4cf0924 add ParentGroup to language 2019-11-01 13:40:20 -04:00
Isaac Connor 968c28395d close group popup when saving 2019-11-01 13:39:40 -04:00
Isaac Connor 9a3bee28d2 add logging and handling of oninput and oninput-this 2019-11-01 13:38:09 -04:00
Isaac Connor 3653ad5ce3 update group editing, solving inline javascript problems and removing cruft 2019-11-01 13:37:52 -04:00
Pliable Pixels 4ae1df2a8c
mention that you can't use payloads with GET 2019-11-01 10:09:32 -04:00
Isaac Connor 46991f04e6 better debugging when fail to sws_scale 2019-11-01 09:24:22 -04:00
Isaac Connor 8f327f23bd
Merge pull request #2746 from connortechnology/fix_2745 
Fix 2745
 2019-10-30 16:59:20 -04:00
Isaac Connor e0d085d187 CHeck for existence of snapshot.jpg or alarm.jpg instead of hitting the database. 2019-10-30 16:57:45 -04:00
Isaac Connor 21df2c6ac7 Always write snapshot.jpg and alarm.jpg instead of only when using video storage 2019-10-30 16:25:09 -04:00
Isaac Connor 3906999872 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-30 09:31:12 -04:00
Isaac Connor 276be8fa37 spacing and quotes 2019-10-30 09:26:17 -04:00
Isaac Connor 15d30b45c3 spacing and quotes 2019-10-30 09:25:55 -04:00
Isaac Connor e4256ddd90 Can't use tainting as SOAP::WDSL::Factory::Transport will fail 2019-10-30 09:22:00 -04:00
Isaac Connor 6ae220f756 improvements to layout on zones and zone. Use ViewWidth and ViewHeight. Replace inline javascript 2019-10-29 18:06:32 -04:00
Isaac Connor daf71aa492 improvements to layout on zones and zone 2019-10-29 18:06:03 -04:00
Isaac Connor 988b2183c3 use new ViewWIdth and ViewHeight functions to generate video stream. 2019-10-29 17:42:48 -04:00
Isaac Connor eb2269ea52 improve zone saving testing for value before doing math 2019-10-29 17:42:23 -04:00
Isaac Connor f2300f2e8c Add isPortrait and isLandscape functions. Rename Width and Height to ViewWidth and ViewHeight to return the rotated dimensions suitable for viewing 2019-10-29 17:39:12 -04:00
Pliable Pixels 5f55bbfc5c
add slack and forum links at the start so they are easy to discover 2019-10-28 12:28:02 -04:00
Pliable Pixels 40da485994
I vote to remove this backtrace FAQ on addr2line - it never seems to be useful 2019-10-27 17:34:55 -04:00
Pliable Pixels ed9ed8da0c
nits 2019-10-27 17:34:10 -04:00
Pliable Pixels a61b456b1c
more fixes, also note that zmN may have issues with web server auth 2019-10-27 17:33:01 -04:00
Pliable Pixels 6ee902e0bf
more fixes 2019-10-27 17:29:15 -04:00