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
94d291a8db
Update readme again =/
2013-09-24 15:27:54 +12:00
3be2a2df8e
Update readme
2013-09-24 15:26:42 +12:00
10e4ca848f
Update branch to track modern
2013-09-24 14:58:41 +12:00
eed6c81287
An ugly hack to make the liveStreams display in both index and view views.
2013-09-23 21:51:02 -04:00
d9bbcdf3a9
Removed web from SUBDIRS in Makefile.am
2013-09-23 20:54:15 -04:00
ea2f2cbac2
Removed old web/ Makefiles from configure.ac
2013-09-23 15:55:16 -04:00
172d7a52d1
Revert "Wrapping the main content in a container to fix #169"
...
This reverts commit 8a9f9a8ab5
2013-09-23 15:22:07 -04:00
0b0c7bea4b
Initial commit of .travis.yml
2013-09-23 15:14:30 -04:00
3f70f6714f
Removed an old </table> tag
2013-09-23 15:09:58 -04:00
8a9f9a8ab5
Wrapping the main content in a container to fix #169
2013-09-23 15:04:23 -04:00
3dfff0b3ac
Merge branch 'master' into feature-h264-videostorage
2013-09-22 10:44:38 +12:00
a7c4d3f3e9
Accidental copy of old logic. Fixed
2013-09-22 10:40:54 +12:00
c38a666301
Merge pull request #158 from WDKevin/modern
...
Checks for updates every 5 minutes and notifies the user when there is one
2013-09-20 08:25:52 -07:00
2e8e3d55ad
Removed green version label and changed to red when a new version is available
2013-09-20 10:49:12 -04:00
0de88e7d68
Fixed small bug left over from testing
2013-09-20 10:49:12 -04:00
d78315de50
Polls the update check every 5 minutes and if an update is available it adds a message beside the version number in the footer. This should fix issue #130
2013-09-20 10:49:11 -04:00
d9c62d5bbe
Merge pull request #161 from chriswiggins/modern
...
Merge master into modern to keep changes up to date
2013-09-20 00:01:47 -07:00
99bae6386e
Merge branch 'monitorSize' of git://github.com/chriswiggins/ZoneMinder into modern
2013-09-20 17:49:04 +12:00
e37b118d1f
I was behind in my master. Re-merge
2013-09-20 09:30:23 +12:00
e25b4d85e9
Merge master into modern
2013-09-20 09:12:36 +12:00
92ec3bd013
Merge branch 'html5-video-event-playback' into modern
2013-09-19 13:47:24 -04:00
f8db56b308
Have the Events view view (not index) use the popup layout
2013-09-19 11:31:54 -04:00
Chris Wiggins
Kyle Johnson
Chetan Chauhan
Kyle Johnson
Kevin Crider
Kfir Itzhak