Martin Hagelin
a148e04ea2
Update zmtrigger.pl.in
...
zmtrigger.pl should not open serial port #1 by default. There could be situations where other hardware etc. would be attached to the port that is not used by zoneminder.
Better if this can be commented out by default and if a user needs serial access, he can enable it by removing the comment.
This line also gives an permissions error when running on Ubuntu which prevents zmtrigger to start. That error can probably be fixed by adding the zm user permission to the serial port. But the main issue is that if the program does not need access to the port, it should not open it.
2014-04-30 15:07:29 +02: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
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
Kyle Johnson
1e13211f02
Merge pull request #403 from kylejohnson/api
...
RESTful API in CakePHP, and docs
2014-04-25 18:24:10 -04: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
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
Kyle Johnson
30657dbf93
Initial index, view, edit, update and delete functions for Zones
2014-04-23 19:53:43 +00:00
Kfir Itzhak
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
Kfir Itzhak
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
Kyle Johnson
485f1b6da8
Initial xml and json views for Monitor view
2014-04-23 03:56:40 +00:00
Kyle Johnson
f97568870c
Initial xml and json views for Monitor index
2014-04-23 03:45:23 +00:00
Kyle Johnson
2ee9ffde60
Initial index, view, edit, update and delete functions for Monitors
2014-04-23 03:44:56 +00:00
Kyle Johnson
8e88fbe87c
Added routes for monitors xml / json
2014-04-23 03:43:59 +00:00
Kyle Johnson
53c8f05812
Added htaccess file to allow rewriting
2014-04-23 03:25:24 +00:00
Kyle Johnson
92e2212d9c
Initial commit of Zone Model
2014-04-23 03:14:25 +00:00
Kyle Johnson
51eced48b1
Initial commit of Event Model
2014-04-23 03:14:15 +00:00
Kyle Johnson
8a70747088
Initial commit of Config Model
2014-04-23 03:14:08 +00:00
Kyle Johnson
5e56a5a7cb
Initial commit of Monitor Model
2014-04-23 03:13:56 +00:00
