e916ce22d9
Update zm_jpeg.cpp
...
Change 0 to FALSE in order to avoid compiling error on Debian Wheezy:
[ 31%] Building CXX object src/CMakeFiles/zm.dir/zm_image.cpp.o
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::WriteJpeg(const char*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:863:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
/opt/ZoneMinder/src/zm_image.cpp: In member function ‘bool Image::EncodeJpeg(JOCTET*, int*, int) const’:
/opt/ZoneMinder/src/zm_image.cpp:1096:42: error: cannot convert ‘bool’ to ‘boolean’ for argument ‘3’ to ‘void jpeg_set_quality(j_compress_ptr, int, boolean)’
make[2]: *** [src/CMakeFiles/zm.dir/zm_image.cpp.o] Error 1
make[1]: *** [src/CMakeFiles/zm.dir/all] Error 2
make: *** [all] Error 2
2014-05-04 02:35:17 +02:00
cec66de647
Merge pull request #416 from kylejohnson/master
...
Added an FAQ for AlarmCheckMethod
2014-05-02 08:37:52 -04:00
312f378d08
Formatting and spell check on the FAQ
2014-05-02 08:31:26 -04:00
435eac5e7e
Expanded upon the AlarmCheckMethod FAQ
2014-05-02 08:28:38 -04:00
5fb17ecfb6
Change one of the FAQs from h1 to h2
2014-05-02 08:16:27 -04:00
26ba50f8ac
Added an FAQ for AlarmCheckMethod
2014-05-02 08:14:57 -04:00
8da9383d5d
use PDO style
2014-04-30 10:09:27 -04:00
e94fca2778
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-04-30 10:01:29 -04:00
b3226223f8
remove uses of dbEscape
2014-04-30 10:01:10 -04:00
20e4570216
Merge pull request #413 from kylejohnson/master
...
Added a doc for contributing to the project
2014-04-30 09:52:16 -04:00
cb2a9af647
Added a doc for contributing to the project
2014-04-30 13:48:03 +00:00
931385fdee
Merge pull request #409 from ZoneMinder/api_cmake
...
Add the web/api folder to cmake
2014-04-30 09:19:02 -04:00
016b5e3677
Merge pull request #411 from martin67/patch-1
...
Don't open /dev/ttyS0 by default in zmtrigger.pl.in
2014-04-30 09:17:03 -04:00
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
ec5784abe2
Fix wrong install path for core.php and database.php
2014-04-30 12:25:42 +03:00
afd4e451fd
Add the web/api folder to cmake
2014-04-30 12:16:46 +03:00
0e2a164c08
Merge pull request #408 from kylejohnson/master
...
Move API to under web dir
2014-04-29 23:31:37 -04:00
ab884aa41b
Added a README to the docs dir
2014-04-30 03:30:31 +00:00
dd854828f0
Change one of the FAQs from h1 to h2
2014-04-30 03:29:11 +00:00
ef19d8cf18
Added another issue to the FAQ (can't see Zones)
2014-04-30 03:24:48 +00:00
4d2f270041
Added FAQ to docs
2014-04-30 03:11:20 +00:00
40e929e7a6
Changed the API readme to be ZoneMinder-relevant
2014-04-29 20:49:54 +00:00
f1f3de6d7d
Moved the api to underneath the web directory
2014-04-29 20:41:04 +00:00
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
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
1e13211f02
Merge pull request #403 from kylejohnson/api
...
RESTful API in CakePHP, and docs
2014-04-25 18:24:10 -04: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
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
aztazt
Kyle Johnson
Kyle Johnson
Isaac Connor
Martin Hagelin
Kfir Itzhak
m-bene