4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
a9f0f3813a
Merge branch 'tesla' into storageareas
2017-11-24 09:31:00 -05:00
900fbe1e0f
update save to a button tag, and add a saveas functionality
2017-11-23 08:26:55 -08:00
b565125df9
montage layout improvements
2017-11-22 12:33:34 -05:00
11449b77a9
add debugging. increase concurrency of request queue
2017-11-22 11:46:24 -05:00
cd1d2e1721
lots more debugging. re-add status update command on failure
2017-11-22 01:18:07 -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
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
617a92e33e
Re-Add streamstatus pause
...
Handles when stream is paused from zms side.
2017-11-16 16:21:17 -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
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
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
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
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
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
7374ced076
0 is a prefectly valid PreEventCount
2017-11-05 10:00:24 -05:00
cab8c4cd5e
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
2017-11-03 13:49:42 -04:00
073c06f6a8
fix sizing after switching scale. basically re-apply the layout
2017-11-03 09:23:50 -04:00
866c875312
Merge branch 'storageareas' into tesla
2017-11-01 12:01:51 -07:00
eb2ee76f57
disable and re-enabled onclick action when editing layout/cancelling edit
2017-11-01 13:08:01 -04:00
8e010b3bd0
get rid of experimental code to fix monitor layout. Apparently draggable does it all for us.
2017-11-01 12:00:48 -04:00
36e13039c7
Switch to LONGTEXT FROM JSON type
2017-11-01 11:05:21 -04:00
33771f92e9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2017-10-31 13:32:47 -07:00
9473fbecd8
more debug
2017-10-31 13:32:42 -07:00
3deb8a35bb
fixes
2017-10-30 21:38:27 -04:00
b5491102ef
Fix saving MontageLayouts
2017-10-30 20:21:16 -04:00
52110adfa9
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:14 -04:00
efe8b2db7e
update code because we are now including the entire object in the layouts array
2017-10-30 16:32:03 -04:00
c69e2468b0
add edit and save layout
2017-10-30 16:30:15 -04:00
a6c790b374
use a shared include for the filters bar
2017-10-30 07:37:08 -07:00
c16e101120
rough in add monitors import wizard
2017-10-27 20:52:08 -07:00
eb48759ff8
wip
2017-10-27 13:37:51 -07:00
71222d7f2f
rework how montage layouts are done, pull from db now
2017-10-27 12:06:26 -07:00
bc150574c7
wip import
2017-10-26 18:56:10 -07:00
12b611b9d5
When in live mode say Camera Offline instead of no data
2017-10-25 13:02:28 -07:00
653d213d62
Add EndTime and DiskSpace to Filters
2017-10-25 11:11:19 -07:00
b6dde354be
rename AnalysisFPS to AnalysisFPSLimit
2017-10-24 17:34:32 -07:00
6b2d0aa59b
fix popup when clicking on a monitor on montagereview
2017-10-23 17:03:41 -07:00
d2c8a0240a
add a monitors view which is for editing function/enabled/server/storage of multiple monitors
2017-10-23 17:01:43 -07:00
df8fbaccea
Fixes
2017-10-23 11:50:45 -07:00
681abd64fc
Instead of No Data, make a more general function that will write any text without clearing the image behind it
2017-10-23 10:54:38 -07:00
1bddec1548
Bypass refreshParentWindow
...
This hasn't worked for a while. It looks like it's the result of a fix for filter window redirecting. It's possible other things use it but this fixes event deletion without touching anything else.
2017-10-22 17:23:04 -04:00
298085ae93
Fix archive nulling vid src
2017-10-22 15:02:36 -04:00
3fe46cbaff
Scale to Fit
...
Added a scale to fit option. When navigating between events of different size they will fill the window. Turned on when any event uses it, turned off when any event turns it off.
2017-10-22 12:13:16 -04:00
Isaac Connor
Isaac Connor
digital-gnome
Isaac Connor
Isaac Connor