2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
1e13211f02
Merge pull request #403 from kylejohnson/api
...
RESTful API in CakePHP, and docs
2014-04-25 18:24:10 -04:00
448d287240
- use _AVCODECID_NONE instead of CODEC_ID_NONE
2014-04-25 23:22:53 +02:00
3155d621d0
- Removed an unreferenced variable
...
- fixed compilation issue with sws_..isSupported when compiling with ffmpeg 0.5
2014-04-25 22:57:29 +02:00
4767326484
A variable was referenced as a pointer when it was not.
2014-04-25 22:27:56 +02:00
04b8ecf0a7
Support streaming with zms (using ffmpeg) better
...
* ZoneMinder compiles with ffmpeg 0.5..master
* Make VideoStream class able to stream through ffmpeg better.
* Ability to use fixed quality instead of fixed bitrate (by specifying bitrate 0...100)
* Format url parameter supports <format>/<encoder> syntax
Details:
- Redefine av_err2str to a to avoid compiler warning on newer g++'s
- When using rtp format; if ffmpeg does not have a default codec, use CODEC_ID_MPEG4. (because this is what the default is as of 2.2 when this code was written)
- Specify ofc->packet_size if rtp format is requested
- Video generated in a thread to guarantee a constant fps.
- Move _AVCODECID definition into zm_ffmpeg.h (and use instead of (AV)CodecID
- Call avformat_network_init because ffmpeg warns about it beeing required soon.
- increase VideoStream::video_outbuf_size to 4MiB to be able to encode larger pictures
2014-04-25 22:12:58 +02:00
e18c4b593d
Added api doc for adding a zone
2014-04-25 19:52:08 +00:00
0d906d4ec9
Added api doc for adding a monitor
2014-04-25 19:29:57 +00:00
e65e17093f
Added api doc for editing configs
2014-04-25 19:19:56 +00:00
2004a5de8a
Ability to edit a config via api by passing in an array
2014-04-25 19:18:59 +00:00
8dd7d3e934
Initial commit of documentation for the API
2014-04-25 19:13:32 +00:00
643e1aac3b
Added docs/_build to .gitignore
2014-04-25 18:44:49 +00:00
48304d2322
Initial commit of Sphinx docs directory
2014-04-25 18:33:41 +00:00
5843f12152
Ability to edit zone via api by passing in array
2014-04-25 18:23:10 +00:00
2e3900d1c7
Ability to edit event via api by passing in array
2014-04-25 18:20:55 +00:00
78ef09705d
Return the correct message when updating a monitor
2014-04-25 18:20:23 +00:00
9fb794f4d0
add option field zo monitors
2014-04-25 13:23:06 +02:00
7aef6e9389
Merge pull request #387 from PX03AFK/patch-4
...
Update zoneminder.cmake.OS13.spec - minor corrections
2014-04-25 11:06:35 +03:00
c64b1318db
Merge pull request #389 from PX03AFK/patch-6
...
Update README.OpenSuse
2014-04-25 11:05:37 +03:00
64c4fd2ce6
Merge pull request #388 from PX03AFK/patch-5
...
Update distros/opensuse/CMakeLists.txt
2014-04-25 10:59:31 +03:00
54a105a29d
Ability to edit monitor via api by passing in array
2014-04-25 03:38:51 +00:00
b86c3f1e43
Zones are deleted when their parent Monitor is
2014-04-25 02:33:02 +00:00
7ced617db2
Frames are deleted when their parent Event is
2014-04-25 02:24:46 +00:00
0bae740a6c
Initial index, view, edit and delete functions for Frames
2014-04-25 02:15:15 +00:00
814359a003
Added a route for frames
2014-04-25 02:14:53 +00:00
c836b81a21
Initial commit of Frame Model
2014-04-25 02:11:05 +00:00
5cabbe280d
Initial xml and json views for Event index and view
2014-04-25 02:01:17 +00:00
5385e20e8e
Initial index, view, edit and delete functions for Events
2014-04-25 02:00:50 +00:00
710bb966b8
Added a route for events
2014-04-25 01:59:57 +00:00
159a1ec533
Initial xml and json views for Config index and view
2014-04-23 20:01:08 +00:00
af91a1482f
Initial index, view, edit and delete functions for Configs
2014-04-23 19:59:52 +00:00
b2ad265054
Added a route for configs
2014-04-23 19:58:52 +00:00
ed8bc57d4c
Added a route for zones
2014-04-23 19:54:15 +00:00
bb7cd7652a
Initial xml and json views for Zone index and view
2014-04-23 19:54:00 +00:00
30657dbf93
Initial index, view, edit, update and delete functions for Zones
2014-04-23 19:53:43 +00:00
3eee90f811
Fix wrong no signal color bug introduced in zm v1.26. Thanks to forum user jcrews for spotting this
...
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21876
2014-04-23 13:27:43 +03:00
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
485f1b6da8
Initial xml and json views for Monitor view
2014-04-23 03:56:40 +00:00
f97568870c
Initial xml and json views for Monitor index
2014-04-23 03:45:23 +00:00
2ee9ffde60
Initial index, view, edit, update and delete functions for Monitors
2014-04-23 03:44:56 +00:00
8e88fbe87c
Added routes for monitors xml / json
2014-04-23 03:43:59 +00:00
53c8f05812
Added htaccess file to allow rewriting
2014-04-23 03:25:24 +00:00
92e2212d9c
Initial commit of Zone Model
2014-04-23 03:14:25 +00:00
51eced48b1
Initial commit of Event Model
2014-04-23 03:14:15 +00:00
8a70747088
Initial commit of Config Model
2014-04-23 03:14:08 +00:00
5e56a5a7cb
Initial commit of Monitor Model
2014-04-23 03:13:56 +00:00
2c94183721
Initial commit of CakePHP 2.5.0-RC1 for the API
2014-04-23 02:51:50 +00:00
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
0dbcc836b4
Merge pull request #325 from elenril/master
...
Support building with new libavcodec versions.
2014-04-19 00:08:39 +03:00
2f542b2396
Merge pull request #395 from hamiltont/patch-6
...
Remove SVN install from Travis CI
2014-04-18 23:23:14 +03:00
m-bene
Kyle Johnson
Sune1337
Kyle Johnson
Kfir Itzhak