9dc19fa32b
Actually store video_data in the correct memory location
2013-09-29 12:55:42 +13:00
76c8190e8b
Update web frontend to correctly display video events
2013-09-29 12:23:28 +13:00
2dcee75100
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into feature-h264-videostorage
2013-09-29 10:13:29 +13:00
9c168a9af5
Check if videoing for bulk frame adding too
2013-09-29 10:10:16 +13:00
8da327e9a3
Keep last keyframe so that as soon as the video starts to record, it has a keyframe to use rather than waiting
2013-09-28 23:26:28 +12:00
35468a5b9c
Tidy up starting and stopping of recording
2013-09-28 23:22:58 +12:00
938f81c753
Add snapshot.jpg to event directory if we are doing a video recording
2013-09-28 23:17:22 +12:00
65afc830b1
Save a snapshot image alongside the h264 video for thumbnail and poster use
2013-09-28 18:50:54 +12:00
983aece616
Consolidate the sidebar for Monitors and Events index.
2013-09-27 20:45:25 -04:00
a2122b9755
Merge pull request #177 from WDKevin/modern
...
Fixes the fixed-width container bug in bootstrap
2013-09-27 17:03:08 -07:00
a852dee7bb
Initial commit of expanding and collapsing error log messages
2013-09-27 19:58:01 -04:00
0630478404
Cleaned up date and time formatting on events page
2013-09-27 18:52:26 -04:00
ef66285fa5
Added universal support for select all checkboxes and added one to the events page
2013-09-27 18:32:00 -04:00
516733a50e
Fixes a small bug with a second border on each monitor panel
2013-09-27 17:50:24 -04:00
a37e2fc168
Adds fullscreen button to hide and show header, sidebar and footer
2013-09-27 17:45:52 -04:00
73d9cfd3d9
Removed fullscreen CSS to be recomitted later
2013-09-27 17:39:24 -04:00
01b2617dd8
Fixes the fixed width bootstrap bug for containers
2013-09-27 17:37:48 -04:00
1f02255413
Put the sidebar into a panel
2013-09-27 09:17:54 -04:00
1887987841
Make the monitors index sidebar a little more terse
2013-09-27 08:42:46 -04:00
e4a05f0ae0
Don't load the masonry JS
2013-09-27 08:42:06 -04:00
8dc161d47a
Use css float, width and margin to position the monitors in the index view.
2013-09-27 08:40:52 -04:00
6e06a35982
Added bootstrap glyphicons
2013-09-27 08:21:19 -04:00
a1a407d543
Merge branch 'modern' into feature-h264-videostorage
2013-09-27 12:11:18 +12:00
9566bfd31a
Display the monitors as "panels"
2013-09-26 13:46:58 -04:00
4c30a70cae
Merge pull request #173 from chetan-prime/feature-h264-videostorage
...
Minor patches to support older ffmpeg under distro's like Ubuntu 12.04. Also ensure H264 recording only for FFMPEG cameras
2013-09-25 12:27:30 -07:00
1251918cff
once more
2013-09-25 15:01:00 +00:00
6b4e703388
Added help text to the Monitors General tab
2013-09-25 10:09:36 -04:00
5ae657d6b0
Added help text to the Monitors Buffers tab
2013-09-25 10:09:14 -04:00
a6ae54eed1
Add a #ifdef to include libavcodec/opt.h only for older ffmpeg's which have it
2013-09-25 14:05:38 +00:00
9e7cd026eb
Enable record support for non-h.264 camera's
2013-09-25 13:58:53 +00:00
26e75df32e
Minor patches to support older ffmpeg under distro's like Ubuntu 12.04
2013-09-25 11:28:38 +00:00
47336fee15
Don't apply default classes to the Monitors edit and add checkboxes
2013-09-24 21:40:21 -04:00
7c32525c9a
Don't put the default div around the Monitors form close button
2013-09-24 21:35:47 -04:00
8fc599240e
Set the class of the default divs to form-group
2013-09-24 21:32:38 -04:00
ae895ad8b7
Set the width of the tab-content to 400px
2013-09-24 21:32:07 -04:00
11983ab039
Don't add a fieldset to the timestamp tab
2013-09-24 21:26:31 -04:00
3994378dd9
Don't use a horizontal form for Monitors add and edit views
2013-09-24 21:23:35 -04:00
29abee74ad
Included the create element instead of the end element
2013-09-24 21:16:44 -04:00
d8108fc6cd
Moved common Monitors add and edit form code to elements.
2013-09-24 21:14:56 -04:00
f3c235544d
Moved the common Monitors add and edit nav code to an element.
2013-09-24 20:43:48 -04:00
3957b709bb
Tell Travis to skip building the modern branch for now [skip ci]
2013-09-24 20:39:02 -04:00
186f763a4c
Moved vars for Monitors edit and add views to appropriate elements.
...
This saves a bunch of redundant code, while putting the code in the
'right place'.
2013-09-24 20:34:36 -04:00
fad481d472
Be quiet with apt-get upgrade and install
2013-09-24 13:25:55 -04:00
f385db2d80
Moved the scaling of streams from JS to PHP
...
The Monitor model is now smart enough to change the stream's scale.
It also has the option of not scaling at all (in the case of the
single monitor view).
2013-09-24 12:54:37 -04:00
5f103b35a4
Load masonry on all pages
2013-09-24 11:21:27 -04:00
87fe605435
Updated masonry from 3.0.0 to 3.1.2
2013-09-24 10:58:23 -04:00
88dbd8db1d
Removed the LiveStreamHelper completely.
...
No longer needed as of 2fa0d3a284
2013-09-24 09:18:01 -04:00
9ccf5c72ce
Forgot to remove debug() from a view
2013-09-24 09:12:42 -04:00
2fa0d3a284
Rewrote the way that monitor streams are created.
...
No longer need LiveStreamHelper, and the logic of which image to
display (live or placeholder) has been moved to the Moniors model.
This way should be much easier to understand and support. This also
fixes my 'ugly hack' in commit eed6c81287
2013-09-24 08:56:04 -04:00
22f9ba5c38
Write the daemon status to Configure
2013-09-24 08:55:46 -04:00
Chris Wiggins
Kyle Johnson
Kyle Johnson
Kevin Crider
Chetan Chauhan