Commit Graph

4406 Commits

Author SHA1 Message Date
Emmanuel Papin a4985fb00d Ignore Makefile.old 2015-03-15 16:46:48 +01:00
Emmanuel Papin 0f10e2b24d Add config.h.in~ to the list of files to ignore 2015-03-14 23:23:21 +01:00
Emmanuel Papin 8a1d00dfd6 Ignore file added at compile time 2015-03-14 23:15:56 +01:00
Emmanuel Papin e219b5c86a Ignore files modified at compile time 2015-03-14 23:14:27 +01:00
Emmanuel Papin c68a325e8e Untrack files modified at compile time 2015-03-14 23:09:36 +01:00
Isaac Connor 2e10263b64 Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1 2015-03-04 16:34:31 -05:00
Isaac Connor 75cfc3f0cd bump release 2015-03-02 17:16:00 -05:00
Isaac Connor 098e66951e remove netpbm from debian packaging 2015-03-02 17:15:27 -05:00
Andrew Bauer 4cc6e6e5c6 Merge pull request #739 from ZoneMinder/fix_basic_rtsp_auth
when auth is needed, try command again before dying.
2015-03-02 10:20:51 -06:00
Isaac Connor 084e2a8b8f when auth is needed, try command again before dying. 2015-03-02 10:47:52 -05:00
Andrew Bauer 20107ac1e6 remove NETPBM dependency from autotools 2015-03-01 10:51:04 -06:00
Andrew Bauer b52ba9da3d Update version 2015-02-27 19:43:56 -06:00
Andrew Bauer 0346aab075 Merge pull request #732 from ZoneMinder/fix_rtsp_slash
fix extra slash when adding trackurl to controlurl
2015-02-26 09:53:57 -06:00
Isaac Connor 3c5b1fd07f fix extra slash when adding trackurl to controlurl 2015-02-26 10:22:21 -05:00
Isaac Connor 1a17c820f2 Merge pull request #730 from ljack/master
Fix image and css import paths for style/skin named "flat"
2015-02-25 11:51:42 -05:00
ljack e9384d445a fix .upBtn and .downBtn also for "flat" css 2015-02-25 18:10:40 +02:00
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
Isaac Connor 6b3bf4f7e6 Merge pull request #729 from ljack/patch-1
Update control.css
2015-02-25 07:27:22 -05:00
ljack 48950f3f1c Update control.css
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +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