Commit Graph

151 Commits

Author SHA1 Message Date
Isaac Connor 8e25b80252 bump version due to db change adding ServerId to Logs 2015-12-31 10:14:20 -05:00
Isaac Connor 029044bca3 merge master, bump version 2015-10-23 16:14:49 -04:00
Kyle Johnson 9dcb3e1df3 Add Index to Frames table. Fixes #1085. 2015-10-22 11:40:25 -06:00
Isaac Connor 582cbe7567 Merge branch 'master' into multi-server 2015-10-15 09:01:19 -04:00
Isaac Connor 2be61906a4 add checks for execinfo library 2015-10-02 13:37:50 -04:00
Isaac Connor ea87ffe66f merge master, bump version to 1.28.108 2015-10-01 11:52:49 -04:00
Kyle Johnson b94a148559 Bump version 2015-09-29 14:28:54 -06:00
Isaac Connor d3dc214d90 let's keep all the versions up to date 2015-09-16 08:39:54 -04:00
Isaac Connor 70fa177a32 bump db version 2015-08-31 16:04:34 -04: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
Robin Daermann 57843cc0c8 Added new Makefiles to configure.ac for dark CSS 2015-07-27 09:53:59 +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
Andrew Bauer d225bf983d Update configure.ac
Add depreciated soon note.
2015-06-23 14:48:57 -05:00
Rick Sayre 12516da3dc Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
Andrew Bauer d5e403b7e0 Merge pull request #775 from ZoneMinder/freebsd_fixes
Freebsd fixes
2015-04-17 15:21:42 -05:00
Andrew Bauer 0a010a69bd autotools - update v4l header file check 2015-04-03 17:36:09 -05:00
Isaac Connor 1b8554fad2 cleanup. 2015-04-01 12:17:23 -04:00
Isaac Connor c2c130df37 try out the new AC_CONFIG_MACRO_DIRS feature. 2015-04-01 10:14:02 -04:00
Isaac Connor bf3efa7a7a allow AC_CHECK_SENDFILE because travis is complaining 2015-03-31 23:31:05 -04:00
Isaac Connor 21915eb92c Merge branch 'master' into freebsd_fixes 2015-03-31 11:06:53 -04:00
Isaac Connor 6114acdadf tell configure to look in m4 for additional macros 2015-03-27 15:15:12 -04:00
Andrew Bauer 20107ac1e6 remove NETPBM dependency from autotools 2015-03-01 10:51:04 -06:00
Isaac Connor 1ffb497757 add lowercase test for BSD, add check for sendmail, don't check for libdl, add check for backtrace 2015-02-24 09:18:49 -05:00
Isaac Connor c4daecc997 Remove duplicated test for CANONICAL_HOST 2015-02-23 16:58:10 -05: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 d7f58af939 Update configure.ac
Update ONVIF Description in configure.ac
2015-02-20 13:28:31 -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
Isaac Connor 60d92d6a59 Add a check for librt which is needed on pi 2015-02-05 11:03:37 -05:00
Isaac Connor 60b69a4174 this add some quoting, it's something debian and ubuntu packaging does, but it's pretty clear that it is good in a more general sense. 2014-12-17 18:06:14 -05: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
Isaac Connor 82c01479c6 move flat css files into the classic skin.
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
Isaac Connor 1e6902f870 Correct the list of Makefiles to be generated 2014-11-26 11:59:51 -05:00
Andrew Bauer 2e8935daf2 Add the ability to specify the zm configdir at build time. 2014-11-11 09:15:15 -06:00
altaroca e0a43adf82 Merge pull request #4 from knnniggett/optional_install
Make onvif support optional
2014-11-01 09:19:00 +01:00
Andrew Bauer 21f34392d4 Make onvif support optional 2014-10-31 19:23:18 -05:00
Andrew Bauer d55e656028 Fix build issue with autotools 2014-10-31 18:33:04 -05:00
Andrew Bauer 71b56a163d Zoneminder 1.28.0 Release 2014-10-18 15:23:13 -05:00
Andrew Bauer a359ea7101 fix copy paste typo 2014-10-05 11:40:10 -05:00
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05:00
Jan M. Hochstein f1b2ba091c Update meta makefiles 2014-09-12 16:06:19 +02:00
Andrew Bauer ad364d090a rename and process zmsystemctl.pl.in 2014-08-19 17:19:44 -05:00
Andrew Bauer 1e8e710f5a full systemd support 2014-08-10 08:47:11 -05:00
Isaac Connor 2087780ec1 tweaks to make debian build with support for mariadb, update version and start using a fourth version digit set 2014-07-29 14:43:13 -04:00