09a715a99f
prevent a warning
2017-11-18 09:41:37 -05:00
c7ecb71810
Fix progressbar on short events
...
Fixes rounding errors at the end of events due to zms only returning integers. Especially noticable on short events.
2017-11-17 22:29:10 -05:00
84403f18a0
Revert dvrControls to class
...
Since dvrControls only occurs once now we can leave it as id.
2017-11-17 12:46:08 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
22ff831859
more cppcheck recommendations
2017-11-16 21:21:56 -05:00
64346a031d
alarmCues to status.php
...
Switched alarm cues from API to ajax/status.php. Less overhead due to only requesting the information it needs and avoids a weird problem with authentication after sitting logged in for hours.
2017-11-16 21:03:03 -05:00
0318fb54a6
add missing initializers
2017-11-16 18:23:02 -05:00
617a92e33e
Re-Add streamstatus pause
...
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -05:00
b918a7be10
add support for fedora 27
2017-11-16 13:42:38 -06:00
6d02c88db9
Don't round percentage in bulkframes
...
Gives more accurate frame delta.
2017-11-16 12:48:04 -05:00
1686584908
more cppcheck fixes
2017-11-16 09:19:27 -05:00
a956ffe7b3
add Copy and =operators to satisfy cppcheck
2017-11-16 09:15:04 -05:00
d411ed329b
get rid of mistyped zmaFPS and zmcFPS
2017-11-16 09:14:26 -05:00
e23a12b22f
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-11-16 09:13:51 -05:00
a95a53d6a6
Merge pull request #49 from Toasty27/patch-1
...
Update zm_create.sql.in
2017-11-16 07:21:50 -05:00
bfd28dda71
Update zm_create.sql.in
...
Added missing column `AnalysisFPS`
2017-11-15 17:59:07 -08:00
087a902698
Update zm_create.sql.in
...
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
2017-11-15 17:44:59 -08:00
97be2bf0a3
fix events js vars, eliminating doing the sql query twice
2017-11-15 13:01:07 -05:00
a7b02ea3ba
Fix eventVideo and content div wrapping properly
...
Wrap eventVideo div around both videojs and zms. Consolidate control buttons/status to common set with default values.
2017-11-14 23:04:05 -05:00
d5962b11ff
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:48:38 -05:00
65e7fb0014
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-14 02:40:12 -05:00
5717a19215
be able to popup watch view even if the monitor is not running
2017-11-13 20:29:01 -05:00
99802945fe
be able to popup watch view even if the monitor is not running
2017-11-13 20:28:18 -05:00
1632aa7349
fix nvsocket
2017-11-13 14:25:19 -08:00
32a27e468d
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-13 11:52:13 -08:00
bc3f169a80
add event_id as a paramteter
2017-11-13 11:51:54 -08:00
878e9e4cde
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-13 11:51:01 -08:00
d07f36a7ee
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-13 10:27:27 -08:00
f093cfbcef
add Filtering to monitors index
2017-11-13 10:27:24 -08:00
ecd86b3fde
cleanup
2017-11-12 15:18:39 -05:00
f476c8f2e5
fixes from cppcheck
2017-11-12 13:25:19 -05:00
a99c5b54fa
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-11-12 13:16:49 -05:00
feca6c3df0
add a copy constructor at the advice of cppcheck
2017-11-12 13:16:18 -05:00
71f13a7c9a
optimisations/fixes from cppcheck
2017-11-12 10:27:47 -05:00
ef6cb42c5f
Cleanup
2017-11-11 14:49:43 -05:00
1b8ae2bb45
Fix autoscale for ZMS
...
ZMS zoom would display broken jpegs with arbitrary scale. When using scaleToFit set zms scale to nearest regular scale and let the browser handle the rest.
2017-11-11 14:49:43 -05:00
44c8299faa
Consolidate initPage
2017-11-11 14:49:43 -05:00
91c3e3573c
ZMS controls for videojs
...
Add ZMS style controls to videojs page. Zoom, fast forward, fast reverse, frame skip, play/pause. Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
21949f5426
Cleanup vjsReplay
2017-11-11 14:49:43 -05:00
f08e75c598
Add remaining buttons to videojs
2017-11-11 14:49:43 -05:00
91cda415bd
Add default values to buttons
2017-11-11 14:49:43 -05:00
1b6992ea6b
Fix stills
...
Event stills fits on the page without a phantom scroll. Still image is scaled to fit the window instead of being full event size.
2017-11-11 14:49:43 -05:00
81a57b086e
Add stills window for everything
...
Stills can work for every event since frames can be generated after the fact by ffmpeg
2017-11-11 14:49:43 -05:00
5e9aacfc09
Stills path fix
2017-11-11 14:49:42 -05:00
5283f778c5
Fix virtual/bulk frame calculation
...
Previously bulk frames wouldn't calculate at the start and end of bulk frame collection. Also the calculation for percent was inaccurate.
2017-11-11 14:49:42 -05:00
8086b6e0a5
whitespace
2017-11-11 14:49:42 -05:00
5960da0b85
Make mp4 link download
...
download instead of view
2017-11-11 14:49:42 -05:00
1ae3fca599
Fast forward and rewind show active
...
FF and RW show as active if they are active
2017-11-11 14:49:42 -05:00
0c59c5ba88
Fix databar jumping
...
dataBar items would jump around when navigating between events dues to automatic spacing and different string lengths. This locks them in place and should allow for most reasonable event sizes.
2017-11-11 14:49:42 -05:00
95622cc3b0
pause on delete
...
Pausing on delete lets a slow network user know that the click worked.
2017-11-11 14:49:42 -05:00
Isaac Connor
digital-gnome
Andrew Bauer
Isaac Connor
Daniel Hodgson
Isaac Connor
Isaac Connor
APHW2 MFGENG