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
e6ba5162ef
choose correct video download
...
Use download mp4 link if it's a videojs event, otherwise use the video generator link.
2017-11-11 14:49:42 -05:00
1007add771
add row highlighting
...
Both other css sets have this
2017-11-11 14:49:42 -05:00
ab87848899
Add visual cue to archived events
...
The asterisk didn't do it for me. Added a faint cast to the row.
2017-11-11 14:49:42 -05:00
4c76b74645
decrease debugging
2017-11-11 09:11:05 -05:00
8694edb1b6
add :80 default
2017-11-10 16:23:38 -05:00
97058065ff
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-10 10:11:03 -08:00
57a53f6fdd
spacing and fixes
2017-11-09 15:03:23 -05:00
14e9a13c99
wip
2017-11-09 11:53:04 -08:00
821717b06e
turn off debug
2017-11-08 11:26:13 -05:00
2570869aa0
bring back libvlc
2017-11-08 11:18:54 -05:00
aba7ecd9a6
split lines
2017-11-08 11:18:23 -05:00
59a87c14d3
fix error message
2017-11-08 11:17:46 -05:00
625170bffc
fix getVideoStream to getVideoStreamHTML. Change how scaling works
2017-11-08 11:17:30 -05:00
402ad0ace3
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-07 18:22:12 -08:00
e17bcb9178
updates for mast ffmpeg
2017-11-07 18:21:51 -08:00
b6548ba137
put curl back, we use it's decoding function for urls
2017-11-07 15:54:13 -05:00
a9419064ef
don't calc fps if no time has passed
2017-11-07 09:35:13 -05:00
c3cfd096c7
Don't connect to the monitor when doing an eventStream
2017-11-07 09:34:47 -05:00
57cb6bb3f2
increase height of monitor
2017-11-06 12:03:24 -08:00
2ffa79172a
Only load Name,Value when loading config because that's all we use
2017-11-06 08:36:53 -08:00
c2fab6e959
add the options for nvsocket as an include
2017-11-06 07:31:08 -08:00
4b8a8e7b56
fix new return value from Capture, 1 signals 1 frame captured
2017-11-05 18:02:09 -05:00
bef7c0ed94
Only start a monitor if it has a Function
2017-11-05 11:54:00 -05:00
7374ced076
0 is a prefectly valid PreEventCount
2017-11-05 10:00:24 -05:00
0a3327e2d2
move test for h264 into the code that opens the stream instead of comparing on every capture
2017-11-05 09:59:27 -05:00
ee96f58ac4
fix fps reporting value when Capture doesn't return a new frame
2017-11-05 09:59:06 -05:00
09f3355e18
add /usr/share/zoneminder/www/cache as a temp dir
2017-11-04 14:52:36 -04:00
63c788ef0e
handle when sql error occurs and no params given
2017-11-03 15:45:11 -04:00
f39353a4a3
add missing breaks
2017-11-03 15:44:53 -04:00
8432ab5938
change quotes, and limit the # of results to 2 when getting next and previous frames. 2 is because one of them could be the currently selected Event,
2017-11-03 15:09:19 -04:00
0ef5c16bcc
when doing parseSort, reset the sortfield to StartTime instead of DateTime
2017-11-03 15:07:04 -04: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
54d77519c0
Only show Storage and Server filters if there is more than 1
2017-11-03 12:03:01 -04:00
67bb8c302f
add missing /
2017-11-03 10:00:29 -04:00
09938ef7ee
join the echo's into 1 to also get the line breaks
2017-11-03 09:24:13 -04:00
073c06f6a8
fix sizing after switching scale. basically re-apply the layout
2017-11-03 09:23:50 -04:00
fdbd344d74
whitespace
2017-11-03 09:23:08 -04:00
4ef28bb30d
don't put the leading / in the cache link
2017-11-03 09:22:43 -04:00
31b756bd53
add missing tests for StartDateTime etc
2017-11-03 07:18:30 -04:00
digital-gnome
Isaac Connor
Isaac Connor
APHW2 MFGENG
Isaac Connor