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

148 Commits

Author SHA1 Message Date
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor 4045211b36 Have cmake take the version from the version file 2016-06-03 09:51:50 -04:00
Andy Bauer 6950e3385a bump project to 1.30.0 2016-05-31 19:41:17 -05:00
Isaac Connor 709fc35167 Merge branch 'master' into icon_video 2016-04-06 11:49:40 -04:00
Andrew Bauer ad13d889fe bump version from 1.29.0 to 1.29.1 2016-04-06 09:30:47 -05:00
Andrew Bauer 9c5b47404d Update CMakeLists.txt 2016-04-06 06:45:21 -05:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor abcf48b65c Merge branch 'master' into feature-h264-videostorage 2016-04-01 08:53:45 -04:00
Andrew Bauer 16992a44cb add ZM_PERL_MM_PARMS 2016-03-11 15:56:29 -06:00
Andrew Bauer b1d3be2cfc add freeBSD cmake target distro 2016-03-11 07:38:29 -06:00
Andrew Bauer 1d478a3b1c change linker flag to "-lexecinfo" 2016-03-10 15:00:21 -06:00
SteveGilvarry 3ce620eb89 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-02-27 19:46:56 +11:00
Andrew Bauer 308d98955e By default, enable ONVIF discovery support 2016-02-08 14:05:06 -06:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
 2016-01-30 15:45:08 +11:00
Andrew Bauer 99b65f0191 Update CMakeLists.txt 2016-01-01 13:39:48 -06:00
Isaac Connor 8e25b80252 bump version due to db change adding ServerId to Logs 2015-12-31 10:14:20 -05:00
SteveGilvarry e28e3c2b75 Merge branch 'master' into feature-h264-videostorage 2015-12-20 14:13:30 +11:00
Andrew Bauer 1957c5672f Check for the presence of CrudControllerTrait.php instead of .git 2015-12-04 12:03:18 -06:00
Steve Gilvarry d9e8f74298 Merge pull request #1173 from knnniggett/submodule 
Error on missing submodules
 2015-11-29 13:22:30 +11:00
SteveGilvarry 220ee5e516 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-11-29 13:17:22 +11:00
Andrew Bauer 91f700a7cd Update CMakeLists.txt 2015-11-23 10:10:56 -06:00
Andy Bauer dabe32a593 Error on missing submodules 2015-11-21 18:21:18 -06:00
Andy Bauer cbfdc5d88d rpm packaging updates 2015-11-21 15:23:13 -06:00
Isaac Connor f322bde35c increase version to 109 because I at some point pushed a db update script 2015-11-16 11:01:11 -05:00
Heng Liu 4e263f5913 Merge branch 'master' into feature-h264-videostorage 
Conflicts:
	src/zm_ffmpeg.h
 2015-11-04 14:39:52 -08:00
Isaac Connor 2115eacdd0 revert change to not overwite zm.conf. It's not right, and it is screwing up package building 2015-10-30 11:28:34 -04:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
 2015-10-23 22:07:22 +11:00
Kyle Johnson 9dcb3e1df3 Add Index to Frames table. Fixes #1085. 2015-10-22 11:40:25 -06:00
Isaac Connor da764a605b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-10-02 13:37:56 -04:00
baffo32 eecfb80292 Fix faulty zm.conf.new install line 2015-10-11 22:41:57 -04:00
Andrew Bauer 3242cde0bf move zm.conf under /etc/zm for Fedora 2015-10-03 13:38:51 -05:00
Andrew Bauer 6861ea00d2 Add Fedora 22 Target Distro 2015-10-03 12:40:34 -05:00
Isaac Connor 2be61906a4 add checks for execinfo library 2015-10-02 13:37:50 -04:00
Isaac Connor 796bad55a3 install zm.conf as zm.conf.new if zm.conf already exists 2015-10-02 12:54:25 -04:00
Isaac Connor fc6a6aeaa3 Don't install zm.conf if it already exists 2015-10-02 11:27:35 -04:00
Kyle Johnson b94a148559 Bump version 2015-09-29 14:28:54 -06:00
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
SteveGilvarry f09a551d6a Merge branch 'master' into feature-h264-videostorage 2015-07-28 21:06:52 +10: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