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
043e44d273
fix, must clear the frame
2017-11-13 14:24:28 -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
ed72017684
add a mutex
2017-11-13 14:35:47 -05: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
8a1e3f1d9a
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2017-11-13 12:38:49 -05:00
aee2b148f0
wip
2017-11-13 12:14:57 -05:00
0e799233d2
move up timestamping to before videowriting
2017-11-13 10:57:37 -05:00
e325f5435c
too much refactoring
2017-11-13 10:17:46 -05:00
eee312a2d4
free contexts
2017-11-12 17:14:21 -05:00
75743d63b6
fixes
2017-11-12 17:02:11 -05: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
ef0f01d498
more debug, try to get pts/dts right
2017-11-12 13:16:40 -05:00
feca6c3df0
add a copy constructor at the advice of cppcheck
2017-11-12 13:16:18 -05:00
50d3b168fa
wip
2017-11-12 11:50:07 -05:00
0e7f475ce8
merge work from zma_to_thread, but not the zma_to_thread part
2017-11-12 11:42:34 -05:00
29782ee938
Merge branch 'zma_to_thread' of github.com:ConnorTechnology/ZoneMinder into zma_to_thread
2017-11-12 10:30:02 -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
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
3dafb5c225
don't delete image when destroying zmpacket
2017-11-11 09:25:13 -05:00
4c76b74645
decrease debugging
2017-11-11 09:11:05 -05:00
3dd8fe072d
add omx
2017-11-10 18:59:58 -05:00
8694edb1b6
add :80 default
2017-11-10 16:23:38 -05:00
ce8350cbef
add :80 default
2017-11-10 16:22:58 -05:00
97058065ff
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
2017-11-10 10:11:03 -08:00
Isaac Connor
Isaac Connor
APHW2 MFGENG
Isaac Connor
digital-gnome