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

4338 Commits

Author SHA1 Message Date
ljack 8616fdb33d fix import path 2015-02-25 18:09:23 +02:00
ljack 6233432559 fix import path 2015-02-25 18:08:41 +02:00
Andrew Bauer 7971dc2e4c Merge pull request #728 from ZoneMinder/fix_event_view 
Fix event view
 2015-02-24 06:57:51 -06:00
Isaac Connor c4daecc997 Remove duplicated test for CANONICAL_HOST 2015-02-23 16:58:10 -05:00
Isaac Connor 362153cb3a Also fix video.pho which has the same problem. 2015-02-23 14:34:13 -05:00
Isaac Connor bff26154b0 Also fix video.pho which has the same problem. 2015-02-23 14:31:15 -05:00
Isaac Connor c9f109bc27 also fix timeline which has the same problem 2015-02-23 14:27:35 -05:00
Isaac Connor dd714665bd use explode instead of preg_split 2015-02-23 14:18:10 -05:00
Isaac Connor bd3a9806b8 Fix sql query when user is limited to specific monitors 2015-02-23 14:16:04 -05:00
Isaac Connor 99c7b212fa Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-02-23 14:15:15 -05:00
Isaac Connor 851a246cf2 Revert "Fix sql query when user is limited to specific monitors" 
This reverts commit 41b581552e.
 2015-02-23 14:10:53 -05:00
Isaac Connor 41b581552e Fix sql query when user is limited to specific monitors 2015-02-23 14:10:18 -05:00
Andrew Bauer 111e75e8e9 add psmisc pacakge requirement to rpm specfiles 2015-02-23 08:09:48 -06:00
Andrew Bauer 397bc57692 Update zoneminder.el6.spec 2015-02-23 07:18:32 -06:00
Andrew Bauer 37fdb595e2 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2015-02-23 07:14:06 -06:00
Andrew Bauer 7d747b72d7 bump version for el6 and f20 specfiles 2015-02-23 07:12:57 -06:00
Andrew Bauer 22f0f33a01 Update INSTALL 2015-02-23 07:09:07 -06:00
Isaac Connor 550d517701 sigh... fix the image to capture_image 2015-02-22 16:36:01 -05:00
Isaac Connor 2f3104aada fix debug line 2015-02-22 16:29:36 -05:00
Isaac Connor 3e33bc2627 This is actually from freebsd... but it's just a more informative error message 2015-02-22 15:01:32 -05:00
Isaac Connor 0355191c6c Merge pull request #687 from knnniggett/rtsp-content-base 
process RTSP DESCRIBE response header
 2015-02-21 17:44:49 -05:00
Isaac Connor a3ef5a3c46 Merge pull request #719 from knnniggett/capturePixFormat 
Allow zm to build w/o ffmpeg
 2015-02-21 15:53:29 -05:00
Isaac Connor 9b0c8085eb Merge pull request #720 from knnniggett/zmonvif 
Don't show ONVIf probe link when ONVIF support is not enabled
 2015-02-21 15:50:07 -05:00
Isaac Connor 86e44c1e1c Merge pull request #721 from knnniggett/onvifptzcontrol 
add onvif ptz control into update script
 2015-02-21 15:48:59 -05:00
Isaac Connor c44d517204 Merge pull request #722 from knnniggett/removeold 
remove unneeded files
 2015-02-21 15:45:36 -05:00
Isaac Connor 2fae36f36b Merge pull request #723 from knnniggett/monitorprobe 
User selectable arp tool
 2015-02-21 15:43:36 -05:00
Andrew Bauer 7ef503ff59 User configurable arp tool 2015-02-21 13:08:04 -06:00
Andrew Bauer b000b997e9 Merge pull request #709 from ZoneMinder/find_arp 
try harder to find arp.
 2015-02-21 11:53:26 -06:00
Andrew Bauer 30a408d08f remove unneeded files 2015-02-21 11:38:51 -06:00
Andrew Bauer e17bad3061 add onvif ptz control into update script 2015-02-21 11:33:49 -06: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 5994811f88 Allow zm to build w/o ffmpeg 2015-02-21 11:02:38 -06:00
Andrew Bauer 42744f4359 Update zoneminder.f21.spec 
bump version in cmake flag
 2015-02-21 09:17:16 -06:00
Andrew Bauer e2b3e7c705 Replace support for Fedora 19 with support for Fedora 21 2015-02-21 09:01:56 -06:00
Andrew Bauer 07006dc23c Merge pull request #718 from SteveGilvarry/Fix_Cmake_endif 
Removed el6 from endif arguments
 2015-02-21 08:37:13 -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 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