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
b196965c4c
Remove SVN install from Travis CI
2014-04-18 13:26:25 -04:00
f2dbb1fe08
Dockerfile works properly, documentation updated
...
- Dockerfile now builds properly
- Dockerfile now ADDs files from local directory. This allows
you to either pull from github (for master) or to build
locally (for development)
- Removes some dependencies from container (wget, git)
- Removes pulling apache virtual host file from github
- Upgrades MySQL start check to actually check instead of just
sleeping
2014-04-18 12:39:05 -04:00
fd4f77b145
Merge pull request #381 from m-bene/flatLayout2
...
Fix window sizes and input field sizes for flat skin
2014-04-18 09:40:00 -04:00
4b7f1896b9
Merge pull request #385 from maciekczwa/master
...
fix sql error which prevents remote login from working
2014-04-18 09:39:09 -04:00
83b2b0c619
Merge pull request #380 from m-bene/switchLayout
...
Fix reload loop on switching skins
2014-04-18 09:38:17 -04:00
cf3283b1a1
Merge pull request #393 from hamiltont/patch-4
...
Remove Subversion from prerequesite lists
2014-04-18 09:36:54 -04:00
cda3f981e6
Merge pull request #390 from hamiltont/patch-1
...
Remove apt-get upgrade from Dockerfile
2014-04-18 09:30:07 -04:00
e5d2f6af7a
Remove Subversion from prerequesite lists
2014-04-18 02:53:16 -04:00
7b62780292
Remove apt-get upgrade
...
Convention is to avoid this if not needed, as there is no init
system and some packages have to be held back. upgrade will
sometimes break due to the state of ubuntu:latest
To see the official issue: dotcloud/docker#1724
To see workarounds: https://github.com/racker/docker-ubuntu-with-updates/blob/master/precise/Dockerfile
2014-04-17 23:05:23 -04:00
ca2b6f36f5
Update README.OpenSuse
...
Additional info on amending database if using version which has /tmp as work space
2014-04-17 15:44:44 -04:00
Kyle Johnson
m-bene
Kfir Itzhak
Hamilton Turner
Kyle Johnson
David Wilcox