Commit Graph

3734 Commits

Author SHA1 Message Date
Kfir Itzhak ec5784abe2 Fix wrong install path for core.php and database.php 2014-04-30 12:25:42 +03:00
Kfir Itzhak afd4e451fd Add the web/api folder to cmake 2014-04-30 12:16:46 +03:00
Kyle Johnson 0e2a164c08 Merge pull request #408 from kylejohnson/master
Move API to under web dir
2014-04-29 23:31:37 -04:00
Kyle Johnson ab884aa41b Added a README to the docs dir 2014-04-30 03:30:31 +00:00
Kyle Johnson dd854828f0 Change one of the FAQs from h1 to h2 2014-04-30 03:29:11 +00:00
Kyle Johnson ef19d8cf18 Added another issue to the FAQ (can't see Zones) 2014-04-30 03:24:48 +00:00
Kyle Johnson 4d2f270041 Added FAQ to docs 2014-04-30 03:11:20 +00:00
Kyle Johnson 40e929e7a6 Changed the API readme to be ZoneMinder-relevant 2014-04-29 20:49:54 +00:00
Kyle Johnson f1f3de6d7d Moved the api to underneath the web directory 2014-04-29 20:41:04 +00:00
m-bene e25420efaa add digest auth file for cmake 2014-04-29 17:31:06 +02:00
m-bene 2ccd3492bf parse 401 response for RTP_RTSP_HTTP 2014-04-29 00:42:38 +02:00
m-bene 3595777d79 add RTSP digest authentication 2014-04-28 23:37:31 +02:00
Sune1337 48b361b1eb - Arrays should be deleted using "delete[]" and not "delete" 2014-04-28 17:20:37 +02:00
Sune1337 a4f597696a - render video using double buffers
this is to deliver frames more accurately to the client
2014-04-26 18:25:48 +02:00
Kyle Johnson c48fb0124d Merge pull request #405 from m-bene/fixDevices
remove call of undefined "fixDevices" function.  Fixes #401
2014-04-26 00:53:02 -04:00
m-bene 28f62c4f8f remove call of undefined "fixDevices" function 2014-04-26 04:23:36 +02:00
m-bene 2881e6b643 focus popup windows 2014-04-26 04:07:33 +02:00
Kyle Johnson 1e13211f02 Merge pull request #403 from kylejohnson/api
RESTful API in CakePHP, and docs
2014-04-25 18:24:10 -04:00
Sune1337 448d287240 - use _AVCODECID_NONE instead of CODEC_ID_NONE 2014-04-25 23:22:53 +02:00
Sune1337 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
Sune1337 4767326484 A variable was referenced as a pointer when it was not. 2014-04-25 22:27:56 +02:00
Sune1337 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
Kyle Johnson e18c4b593d Added api doc for adding a zone 2014-04-25 19:52:08 +00:00
Kyle Johnson 0d906d4ec9 Added api doc for adding a monitor 2014-04-25 19:29:57 +00:00
Kyle Johnson e65e17093f Added api doc for editing configs 2014-04-25 19:19:56 +00:00
Kyle Johnson 2004a5de8a Ability to edit a config via api by passing in an array 2014-04-25 19:18:59 +00:00
Kyle Johnson 8dd7d3e934 Initial commit of documentation for the API 2014-04-25 19:13:32 +00:00
Kyle Johnson 643e1aac3b Added docs/_build to .gitignore 2014-04-25 18:44:49 +00:00
Kyle Johnson 48304d2322 Initial commit of Sphinx docs directory 2014-04-25 18:33:41 +00:00
Kyle Johnson 5843f12152 Ability to edit zone via api by passing in array 2014-04-25 18:23:10 +00:00
Kyle Johnson 2e3900d1c7 Ability to edit event via api by passing in array 2014-04-25 18:20:55 +00:00
Kyle Johnson 78ef09705d Return the correct message when updating a monitor 2014-04-25 18:20:23 +00:00
m-bene 9fb794f4d0 add option field zo monitors 2014-04-25 13:23:06 +02:00
Kfir Itzhak 7aef6e9389 Merge pull request #387 from PX03AFK/patch-4
Update zoneminder.cmake.OS13.spec - minor corrections
2014-04-25 11:06:35 +03:00
Kfir Itzhak c64b1318db Merge pull request #389 from PX03AFK/patch-6
Update README.OpenSuse
2014-04-25 11:05:37 +03:00
Kfir Itzhak 64c4fd2ce6 Merge pull request #388 from PX03AFK/patch-5
Update distros/opensuse/CMakeLists.txt
2014-04-25 10:59:31 +03:00
Kyle Johnson 54a105a29d Ability to edit monitor via api by passing in array 2014-04-25 03:38:51 +00:00
Kyle Johnson b86c3f1e43 Zones are deleted when their parent Monitor is 2014-04-25 02:33:02 +00:00
Kyle Johnson 7ced617db2 Frames are deleted when their parent Event is 2014-04-25 02:24:46 +00:00
Kyle Johnson 0bae740a6c Initial index, view, edit and delete functions for Frames 2014-04-25 02:15:15 +00:00
Kyle Johnson 814359a003 Added a route for frames 2014-04-25 02:14:53 +00:00
Kyle Johnson c836b81a21 Initial commit of Frame Model 2014-04-25 02:11:05 +00:00
Kyle Johnson 5cabbe280d Initial xml and json views for Event index and view 2014-04-25 02:01:17 +00:00
Kyle Johnson 5385e20e8e Initial index, view, edit and delete functions for Events 2014-04-25 02:00:50 +00:00
Kyle Johnson 710bb966b8 Added a route for events 2014-04-25 01:59:57 +00:00
Kyle Johnson 159a1ec533 Initial xml and json views for Config index and view 2014-04-23 20:01:08 +00:00
Kyle Johnson af91a1482f Initial index, view, edit and delete functions for Configs 2014-04-23 19:59:52 +00:00
Kyle Johnson b2ad265054 Added a route for configs 2014-04-23 19:58:52 +00:00
Kyle Johnson ed8bc57d4c Added a route for zones 2014-04-23 19:54:15 +00:00
Kyle Johnson bb7cd7652a Initial xml and json views for Zone index and view 2014-04-23 19:54:00 +00:00