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

4553 Commits

Author SHA1 Message Date
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 d7f58af939 Update configure.ac 
Update ONVIF Description in configure.ac
 2015-02-20 13:28:31 -06:00
Andrew Bauer a783118912 Merge pull request #714 from Jypy/master 
Update fr_fr.php
 2015-02-20 07:42:17 -06:00
Jean-Philippe Bouillot 3b9c3f0776 Update fr_fr.php 2015-02-20 12:30:33 +01: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
Andrew Bauer aad70bc2c7 Merge pull request #713 from ZoneMinder/validate_skin_and_css 
Check to make sure that skin and css are valid.
 2015-02-19 15:20:15 -06:00
Isaac Connor 0af7d0cc0b check defined(ZM_DEFAULT_SKIN) otherwise php will turn it into a string 2015-02-19 16:04:06 -05:00
Isaac Connor b159f6ce9e Fatal->Error since Fatal is fatal 2015-02-19 15:57:37 -05:00
Isaac Connor 438456ce93 include output if can't find arp 2015-02-19 15:43:34 -05:00
Isaac Connor 8eb8cacd56 Check to make sure that skin and css are valid. 2015-02-19 14:17:33 -05:00
Isaac Connor c3f96ad8ca fix path to the zone point gif 2015-02-19 11:11:01 -05:00
Andy Bauer 630ca6e551 Merge branch 'altaroca-478-onvif-support' 2015-02-18 18:54:29 -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 22b73c1610 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-02-18 16:32:06 -05:00
clipo1979 a219915702 Merge pull request #1 from knnniggett/clipo1979-master 
Looks good, I was thinking about the changes you've done but didnt want to go to far with my initial offerings
 2015-02-18 18:15:30 +00:00
Andrew Bauer 6c65c89643 Merge pull request #711 from SteveGilvarry/720_avformat_free_context_version_check 
Fixes #710 Added libavformat version check around free context functions
 2015-02-18 07:26:18 -06:00
SteveGilvarry 83cc398a24 Added libavformat version check around free context functions 2015-02-18 23:25:31 +11:00
Isaac Connor 13c6be548d If type -p doesn't work, try which, and if that doesn't work just try /usr/sbin/arp. Also don't bother with escapeshellcmd because these are not user inputs. 2015-02-17 15:39:59 -05:00
Isaac Connor e807560d86 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-02-17 11:47:30 -05: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 18abb3761d Update CMakeLists.txt 2015-02-15 15:50:21 +00:00
clipo1979 e762a615d3 Rename zoneminder.el6.conf to zoneminder.el6.conf.in 2015-02-15 15:48:40 +00:00
clipo1979 c6f256fef4 Rename zoneminder.el6.logrotate to zoneminder.el6.logrotate.in 2015-02-15 15:48:14 +00:00
clipo1979 aa00de486b Rename zoneminder.el7.logrotate to zoneminder.el7.logrotate.in 2015-02-15 15:47:42 +00:00
clipo1979 200f48da34 Rename zoneminder.tmpfiles to zoneminder.tmpfiles.in 2015-02-15 15:46:00 +00:00
clipo1979 4fc4789b08 Update zoneminder.el6.conf 2015-02-15 14:23:28 +00:00
clipo1979 813de8540f Update zoneminder.el6.logrotate 2015-02-15 14:21:16 +00:00
clipo1979 160503df14 Update zoneminder.el7.logrotate 2015-02-15 14:20:23 +00:00
clipo1979 6b8ce2e0d4 Rename zoneminder.in to zm.in 2015-02-15 14:06:54 +00:00
clipo1979 e80702bb22 Update CMakeLists.txt 2015-02-15 14:03:06 +00:00
clipo1979 5f96882ec7 Update CMakeLists.txt 2015-02-15 14:00:34 +00:00
clipo1979 39c5d3ad06 Update zoneminder.tmpfiles 2015-02-15 13:48:46 +00:00
clipo1979 308a8b9df3 Update CMakeLists.txt 2015-02-15 13:34:17 +00:00
clipo1979 12964f5635 Update CMakeLists.txt 2015-02-15 11:44:46 +00:00
clipo1979 3e03745603 Rename zoneminder.el7.conf to zoneminder.el7.conf.in 2015-02-15 11:43:10 +00:00
clipo1979 b42b646e5e Update zoneminder.el7.conf 2015-02-15 11:39:27 +00:00
clipo1979 0991391f45 Update CMakeLists.txt 2015-02-15 11:34:27 +00:00
Andrew Bauer c54b9aa6bc Update zoneminder.f21.spec 
typo
 2015-02-14 11:29:34 -06:00
Andrew Bauer 9ac5b2b1c5 create zoneminder spec file for fedora 21 2015-02-14 11:25:03 -06:00
Isaac Connor cdb5180964 bump snapshot release 2015-02-13 13:14:50 -05:00
Isaac Connor eb73c16246 add mysql-client-5.6 as an option in depends 2015-02-13 13:06:03 -05:00
Andrew Bauer 8da2e0a667 Update CMakeLists.txt 
ZM_CONFIG was overwriting itself
 2015-02-13 07:29:21 -06:00
Andrew Bauer 8480eda48c Update README.Centos7 2015-02-13 06:55:45 -06:00
Andrew Bauer 4d33a55f9e Update README.Centos7 2015-02-13 06:50:50 -06:00
Andrew Bauer f20a233ab2 Update zoneminder.el7.spec 
move zm.conf to /etc/zm
 2015-02-11 17:57:13 -06:00
Andrew Bauer ccad736893 Update README.Centos7 2015-02-11 13:55:02 -06:00
Isaac Connor 2b53e439b9 Add Capture Resolution to replace Capture Width and Capture Height 2015-02-11 13:14:51 -05:00
Isaac Connor 4439187f19 Better debug output, handle ENOTTY in STANDARD ENUMERATION 2015-02-10 11:53:50 -05:00
Isaac Connor dc470f155c Merge pull request #702 from ZoneMinder/small_local_camera_improvements 
small improvements:
 2015-02-10 11:22:31 -05:00