ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,982 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

101 Commits

Author SHA1 Message Date
Andy Bauer 4a04d0411b bump version to 1.28.106 2015-08-29 08:00:02 -05:00
Andy Bauer 395e628541 Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe 
Conflicts:
	CMakeLists.txt
	configure.ac
	version
 2015-08-29 07:57:18 -05:00
Andy Bauer 4fdd32b596 bump version to 1.28.106 2015-08-29 07:53:08 -05:00
Andrew Bauer 9abc161995 bump version to 1.28.105 2015-08-21 10:33:42 -05:00
Robin Daermann fbcd6f365b Change database schema (add 'Blacken' zone type) and bump version to 1.28.105 2015-08-20 16:17:08 +02:00
Andrew Bauer fe3595bfa1 Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_update-1.28.101.sql
	src/zm_monitor.cpp
	src/zm_monitor.h
	version
 2015-08-18 20:20:53 -05:00
Robin Daermann 55eee8d6a4 Added SQL changes to zm_create.sql.in 
Bumped version to 1.28.103 as requested
 2015-08-17 15:05:17 +02:00
Robin Daermann 0547a66870 Bump version to 1.28.102 2015-08-17 13:40:30 +02:00
Robin Daermann 7f3a07f21b Add label size to monitor options (database and backend part) 
This commit bumps version to 1.28.101 because of database schema change
 2015-08-10 15:35:18 +02:00
Emmanuel Papin 132e0a1798 Add analysis fps paramter to monitors 2015-07-22 21:38:35 +02:00
Isaac Connor 47be582354 bump version to 1.28.100 2015-07-14 16:11:27 -04:00
Isaac Connor 376912158c bump version to 1.28.99 so that dbupdate scripts actually run 2015-07-07 15:47:45 -04:00
Isaac Connor 58448adb51 Merge pull request #896 from knnniggett/pod2man 
Generate man pages for perl scripts & C Binaries in the bin folder
 2015-07-03 11:40:24 -04:00
Isaac Connor e0da473449 add check for gettime in librt, needed for building on pi 2015-07-03 10:53:23 -04:00
Andrew Bauer 3f6333a33d modify polkit checks & move host os check 2015-06-25 08:01:24 -05:00
Bill McGonigle ec1c3cfed0 Add cmake ffmpeg include path hint for distros that put headers in include/ffmpeg. 2015-06-24 01:39:26 -04:00
Andrew Bauer fa835359a1 Add install target for C binary man pages 2015-06-20 17:33:13 -05:00
Isaac Connor dcb7b1d259 Merge pull request #883 from pliablepixels/881-bootstrap-loading-config 
881 bootstrap loading config
 2015-06-14 14:43:01 -04:00
SteveGilvarry 22ec67dd3f Find avconv as alternative to ffmpeg 2015-06-14 16:51:31 +10:00
pliablepixels 11bd2139f4 Added API version in addition to ZM version 2015-06-13 16:30:28 +00:00
Andrew Bauer e8ecc505ed fix error 2015-05-20 17:23:41 -05:00
Andrew Bauer 47012c58de Check the Host OS, similar to configure.ac 2015-05-20 17:20:44 -05:00
SteveGilvarry d96c952047 Merge branch 'master' into Cmakelists_CleanUp 
Conflicts:
	CMakeLists.txt
 2015-05-19 21:12:34 +10:00
Andrew Bauer d5e403b7e0 Merge pull request #775 from ZoneMinder/freebsd_fixes 
Freebsd fixes
 2015-04-17 15:21:42 -05:00
Isaac Connor 1668949f18 Merge pull request #792 from knnniggett/perl 
cmake - use perl INSTALLDIRS
 2015-04-15 11:07:14 -04:00
SteveGilvarry 14cf1bcae6 Clean up CMakeLists.txt, wrap lines, remove comments from initial commit, update comments. No functionality changes 2015-04-15 22:09:25 +10:00
Isaac Connor 05634f694a Merge pull request #781 from knnniggett/v4l_headers 
Check for libv4l1-videodev headers
 2015-04-10 13:30:15 -04:00
Andrew Bauer fa633bff92 spelling 2015-04-10 12:17:06 -05:00
Andrew Bauer 0cf82a0b71 Allow user to override perl installation. Replace old perl cmake vars with new. 2015-04-10 12:09:01 -05:00
Andrew Bauer ef21d08dd3 Update CMakeLists.txt 
typo
 2015-04-09 10:44:16 -05:00
Andrew Bauer 2331d731d1 cmake - update v4l header file check 2015-04-03 18:21:28 -05:00
Isaac Connor 199c94e7db Add Sendfile checks for cmake 2015-03-31 23:07:19 -04:00
Andrew Bauer 4182fb3295 Don't show ONVIf probe link when ONVIF support is not enabled 2015-02-21 11:12:07 -06:00
Andrew Bauer e2b3e7c705 Replace support for Fedora 19 with support for Fedora 21 2015-02-21 09:01:56 -06:00
SteveGilvarry 240d97b17a Removed el6 from endif arguments as some versions of Cmake want if and endif arguments to match 2015-02-21 20:50:00 +11:00
Andrew Bauer 568fea61fa Merge pull request #704 from clipo1979/master 
Make el6 and el7 build process a little more automated
 2015-02-19 19:18:26 -06:00
Andy Bauer 9f3ff787d1 Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support 
Conflicts:
	CMakeLists.txt
	configure.ac
	db/zm_create.sql.in
	distros/redhat/archive/zoneminder.el6.spec
	distros/redhat/zoneminder.el6.spec
	web/skins/classic/views/monitor.php
 2015-02-18 18:53:47 -06:00
Andy Bauer 77f554f7ba bump verion to 1.28.1 in master 2015-02-18 18:24:26 -06:00
Andrew Bauer e3351441c7 fix cmake error, rename init script to zoneminder, modify el6 target distro 2015-02-15 15:59:58 -06:00
clipo1979 0991391f45 Update CMakeLists.txt 2015-02-15 11:34:27 +00:00
Andrew Bauer 8da2e0a667 Update CMakeLists.txt 
ZM_CONFIG was overwriting itself
 2015-02-13 07:29:21 -06:00
Andrew Bauer d449d00569 typo 2015-02-08 16:42:03 -06:00
Andrew Bauer d833505664 typo 2015-02-08 16:39:59 -06:00
Andrew Bauer 72da7a0e69 process redhat subfolder when EL7 is specified 2015-02-08 16:37:29 -06:00
Andrew Bauer 9bc28c96f0 Centos 7 rpm packaging 2015-02-08 16:16:31 -06:00
Isaac Connor 6c9f93af63 Merge pull request #567 from knnniggett/zm_config_dir 
Add the ability to specify the zm configdir at build time.
 2014-12-08 10:01:17 -05:00
Cosme Domínguez Díaz bcbb0c56a6 Apply knnniggett's solution on gnutls-openssl issue which 
adds support for RPM based distros.
 2014-11-12 22:39:54 +01:00
Andrew Bauer 2e8935daf2 Add the ability to specify the zm configdir at build time. 2014-11-11 09:15:15 -06:00
Cosme Domínguez Díaz 964cdde2b3 Use gnutls-openssl instead of gnutls to 
fix build with CMake.
 2014-11-11 00:34:23 +01:00
Andrew Bauer 21f34392d4 Make onvif support optional 2014-10-31 19:23:18 -05:00