Commit Graph

3699 Commits

Author SHA1 Message Date
Kfir Itzhak eeca5928dd Merge pull request #216 from knnniggett/cmake_targetdistro
Create ZM_TARGET_DISTRO option in cmake
2013-10-19 13:02:55 -07:00
Kfir Itzhak 9858c06a4f Merge pull request #215 from knnniggett/cmake_nox10
Add ZM_NO_X10 cmake option to toggle x10 support
2013-10-19 13:02:14 -07:00
Kfir Itzhak 4c803299bc Merge pull request #214 from knnniggett/cmake_fedora
Cmake support files for fedora distro
2013-10-19 13:01:12 -07:00
Andrew Bauer d544a92ccb change chkconfig default 2013-10-19 13:54:25 -05:00
Andrew Bauer 60962566a5 cmake support files for redhat/centos distros 2013-10-19 13:50:59 -05:00
Andrew Bauer 72973ff7e7 Add new zoneminder cmake specfile 2013-10-19 12:14:43 -05:00
Andrew Bauer 539c760d3c Create ZM_TARGET_DISTRO 2013-10-19 09:38:58 -05:00
Andrew Bauer 54a22e7fe8 We need a toggle for x10 support 2013-10-19 09:22:59 -05:00
Andy Bauer b1c76ad0b6 Cmake support files for fedora distro 2013-10-19 08:49:47 -05:00
Isaac Connor ae51ac5519 redo changes to use new dbFetch functions with parameter arrays 2013-10-18 14:24:08 -04:00
Isaac Connor 7fdb933d6b rework dbQuery, dbFetchOne to take a parameters array, and use it 2013-10-18 14:15:24 -04:00
Isaac Connor cde89a7144 more quoting removal, some slight optimisations 2013-10-17 21:03:24 -04:00
Isaac Connor 92591a6835 more removal of quotes 2013-10-17 17:05:50 -04:00
Isaac Connor ef765afa2d Merge branch 'master' into mysql2PDO 2013-10-17 17:02:44 -04:00
Isaac Connor 355c10c3a4 fix error when strict modes is on. 2013-10-17 17:02:17 -04:00
Isaac Connor 60e2703637 fix missing n 2013-10-17 17:01:37 -04:00
Isaac Connor 09fbdc9e35 forget the updates to this file 2013-10-17 16:57:05 -04:00
Isaac Connor 2a45506bff more quoting removal 2013-10-17 16:15:04 -04:00
Isaac Connor 0979830b91 more removal of exra quotes 2013-10-17 15:54:17 -04:00
Isaac Connor 36c4fad644 remove extra quoets since dbEcape does quoting now 2013-10-17 15:35:23 -04:00
Isaac Connor 870a59bed4 fix missing <?php. The missing full size tag makes the file fail when short tags are turned off 2013-10-17 14:23:25 -04:00
Isaac Connor 92d22b5202 Merge branch 'master' into mysql2PDO 2013-10-16 16:58:33 -04:00
Isaac Connor b126c5ae7e fix typo 2013-10-16 16:55:24 -04:00
Isaac Connor cd63b0a2a7 add defaults for ZM_DB_TYPE 2013-10-16 16:10:31 -04:00
Isaac Connor 5eb313b896 add config lline for DB type 2013-10-16 16:08:41 -04:00
Isaac Connor 9e2d7cfd24 initial convert to PDO with no testing 2013-10-16 16:07:58 -04:00
Kyle Johnson 5ead2a4394 Merge pull request #207 from knnniggett/prev_btn
Change Prev Button functionality.  Fixes #32.
2013-10-16 06:40:20 -07:00
Kyle Johnson 7bf4de37de Merge pull request #211 from kylejohnson/master
ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler)
2013-10-15 13:23:57 -07:00
kjohnson dff5b3aeb0 ZoneMinder Dutch Translation updates by Alco (a.k. nightcrawler) 2013-10-14 09:27:01 -04:00
Andrew Bauer 62dbb6e5fb Update README.Fedora
typo
2013-10-14 06:47:29 -05:00
Kfir Itzhak edcca74f95 Add detection status in cmake for optional libraries 2013-10-14 07:58:21 +03:00
Andy Bauer 32cf3663f3 Update README.Fedora
add "sudo"
2013-10-13 08:22:16 -05:00
Andy Bauer a3dc2b50d3 Update README.CentOS 2013-10-11 06:47:32 -05:00
guotie 557c0a3d30 Update zm_remote_camera_http.cpp 2013-10-11 14:31:37 +08:00
guotie 042e50eecc Update zm_remote_camera_http.cpp 2013-10-11 14:28:43 +08:00
guotie e0728f7dc1 Update zm_remote_camera.cpp 2013-10-11 14:26:48 +08:00
guotie e35c541715 Update zm_remote_camera.h 2013-10-11 14:24:23 +08:00
Andy Bauer b7e69f0104 Update zoneminder.cmake.f19.spec
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:30:38 -05:00
Andy Bauer e16c2502d6 Update zoneminder.f19.spec 2013-10-10 13:29:46 -05:00
Andy Bauer 1e756a1529 Update zoneminder.cmake.el6.spec
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:29:15 -05:00
Andy Bauer 8f512729f3 Update zoneminder.el6.spec
Remove noreplace %config flag from zm.conf. We want upgrades to overwrite this file.
2013-10-10 13:28:42 -05:00
Andy Bauer 6f313ad866 Update zoneminder.f19.spec
fix typo
2013-10-10 06:32:45 -05:00
Kfir Itzhak bb5b936ad3 Fixed a bug with HAVE_LIBAVDEVICE_AVDEVICE_H in cmake 2013-10-10 14:04:00 +03:00
Kfir Itzhak 421d67e379 Improvements to zm_ffmpeg.h 2013-10-10 07:16:11 +03:00
Kfir Itzhak 8cecadadc2 Fix rotation bug caused by commit 5a9364703c 2013-10-10 06:55:45 +03:00
Andy Bauer 4218ef0113 Update README.Fedora 2013-10-09 18:37:48 -05:00
Andy Bauer 78effbab45 Update README.Fedora 2013-10-09 18:36:59 -05:00
Andy Bauer 33f7673656 Update README.Fedora 2013-10-09 18:35:39 -05:00
Andy Bauer 5c7674ca09 Update zoneminder.f19.spec 2013-10-09 18:34:07 -05:00
Andy Bauer 4336b6cdb4 Update zoneminder.f19.spec 2013-10-09 18:23:46 -05:00