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

155 Commits

Author SHA1 Message Date
Emmanuel Papin 746deece73 Rename some files, remove links to unused libraries on binaries and some cleanup 2015-05-29 22:26:11 +02:00
Emmanuel Papin eff56664c3 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 
Conflicts:
	web/lang/de_de.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/plugin.php
 2015-05-28 23:43:13 +02: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
Emmanuel Papin 5283369ed6 Reintroduce modif after upstream merge 2015-05-06 01:03:36 +02:00
Emmanuel Papin 630c8f335f Merge master 2015-05-05 23:37:20 +02: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
Emmanuel Papin 0840d31011 Fix configure.ac file 2015-02-27 20:54:35 +01:00
Emmanuel Papin 9929233e75 Merge branch 'master' into plugin_support_test 
Conflicts:
	configure.ac
	web/lang/fr_fr.php
 2015-02-25 23:14:25 +01: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
Emmanuel Papin 5060fc490f Merge branch 'master' into plugin_support_test 2015-02-15 15:03:23 +01:00
Isaac Connor 60d92d6a59 Add a check for librt which is needed on pi 2015-02-05 11:03:37 -05:00
Emmanuel Papin abddb5d916 Readd commit 60b69a4174 from upstream master 2015-01-13 01:18:56 +01:00
Emmanuel Papin cdfb4b4bb5 Merge branch 'plugin_support_basic' into plugin_support 
Conflicts:
	distros/debian8/zoneminder.dirs
 2015-01-01 19:13:53 +01:00
Emmanuel Papin ee259be366 Remove unwanted modification in configure.ac 2015-01-01 19:11:53 +01:00
Emmanuel Papin d070b36aec Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support 2014-12-31 12:23:26 +01:00
Emmanuel Papin 45edab3ad9 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into plugin_support_basic 
Conflicts:
	distros/debian/control
	distros/debian8/zoneminder.dirs
	web/skins/classic/views/js/Makefile.am
 2014-12-31 12:20:56 +01:00
Emmanuel Papin c1d7d7c744 Try to fix 'ltmain.sh not found' issue at first compilation 2014-12-21 17:40:08 +01: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
Emmanuel Papin f79887d453 Update version in configure.ac and CMakeLists.txt 2014-12-14 00:37:54 +01:00
Emmanuel Papin 82ef0edac3 Restore conflictuous modifications for plugin support 2014-12-13 20:02:58 +01:00
Emmanuel Papin d961831355 Fix conflict when merging upstream master 2014-12-13 19:54:54 +01: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
Emmanuel Papin e37793f79a Upgrade version to force database update 2014-11-29 22:28:56 +01:00
Isaac Connor 1e6902f870 Correct the list of Makefiles to be generated 2014-11-26 11:59:51 -05:00
manupap1 2033918b24 Add a pkg-config file 2014-11-11 23:53:09 +01:00
manupap1 12f0177f14 Add plugin options in configure 2014-11-11 23:03:25 +01:00
manupap1 03d03bda21 Add a global configuration file for plugins 2014-11-11 20:59:58 +01:00
manupap1 e60c3d552c Remove unwanted dependencies 2014-11-11 20:24:48 +01:00
manupap1 26608afa2d Remove obsolete declaration 2014-11-11 19:49:28 +01:00
manupap1 93a29545ce Add libtool support for plugins 2014-11-11 19:46:20 +01: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