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

3446 Commits

Author SHA1 Message Date
Hamilton Turner 7b62780292 Remove apt-get upgrade 
Convention is to avoid this if not needed, as there is no init 
system and some packages have to be held back. upgrade will 
sometimes break due to the state of ubuntu:latest

To see the official issue: dotcloud/docker#1724
To see workarounds: https://github.com/racker/docker-ubuntu-with-updates/blob/master/precise/Dockerfile
 2014-04-17 23:05:23 -04:00
Kyle Johnson db5a8fe194 Merge pull request #375 from m-bene/flatLayout 
Fix small / cropped DRV controls in event view.  Fixes #356
 2014-04-09 16:45:15 -04:00
m-bene bd5e25644e same dvr controlls in event as in monitor 2014-04-09 20:19:23 +02:00
Isaac Connor afc7581146 use zmDbConnect instead of all the DBI connect stuff 2014-04-09 10:34:58 -04:00
Andrew Bauer 35468af815 Merge pull request #338 from m-bene/extendPreclusive 
add feature to extend preclusive zone alarm state by x frames
 2014-04-08 08:04:37 -05:00
Andrew Bauer 8bd7f131bf Merge pull request #367 from PX03AFK/patch-3 
Update zoneminder.tmpfiles
 2014-04-08 07:48:38 -05:00
Andrew Bauer 8fb83e867c Merge pull request #374 from m-bene/parseFilters 
do not quote column names in parse filter
 2014-04-08 07:40:25 -05:00
m-bene f22b956b8b do not quote column names in parse filter 2014-04-08 09:07:59 +02:00
Andrew Bauer 221f9afa6c Merge pull request #373 from m-bene/filterTermsUndefined 
Fix 'Undefined index: filter' php warnings for filter view when
 2014-04-07 15:24:54 -05:00
m-bene 9a714f8d6d Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments 2014-04-07 16:11:48 +02:00
David Wilcox 5cd165e9d5 Update zoneminder.tmpfiles 
Incorrect directory
 2014-04-03 22:16:38 -04:00
Isaac Connor 329f6ae5c4 Merge branch 'mysql2PDO' 2014-03-28 10:16:14 -04:00
Isaac Connor 3212974bdf Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-03-28 10:12:39 -04:00
Andrew Bauer d221b2de4c Merge pull request #353 from barjac/master 
Update zmupdate.pl.in
 2014-03-27 17:59:15 -05:00
Andrew Bauer dda1034927 Merge pull request #362 from PX03AFK/patch-2 
Update zoneminder.cmake.OS13.spec
 2014-03-27 17:58:27 -05:00
Andrew Bauer 52081200f2 Merge pull request #361 from PX03AFK/patch-1 
Update README.OpenSuse
 2014-03-27 17:58:01 -05:00
David Wilcox c4645de0e6 Update zoneminder.cmake.OS13.spec 2014-03-26 23:06:42 -04:00
David Wilcox a7a5f5d543 Update README.OpenSuse 2014-03-26 23:05:20 -04:00
Andrew Bauer d60b4a2eee Merge pull request #352 from m-bene/CurlHeaderCase 
make curl header check case insensitive
 2014-03-25 17:23:56 -05:00
Andrew Bauer d2be7d4cd8 Update zm_event.cpp 
Commit 79af2adaa0 attempted to fix the Prev button when in Gapless Mode, but it caused issues when rewinding. Rolling back.
 2014-03-25 07:01:40 -05:00
Isaac Connor 888fafe767 Merge branch 'mysql2PDO' of github.com:ZoneMinder/ZoneMinder into mysql2PDO 2014-03-24 13:44:19 -04:00
Isaac Connor d6a27b31e8 fix extra } 2014-03-24 13:44:06 -04:00
Kyle Johnson ef2b4955a2 Removed extra }. Fixes #354 2014-03-24 13:36:04 -04:00
barjac fd9e808fe1 Update zmupdate.pl.in 
Fix typo 'from' version replaced with 'to' version.
 2014-03-24 13:35:53 +00:00
m-bene 32941cfef7 make curl header check case insensitive 2014-03-23 07:06:54 +01:00
Isaac Connor 957d6f123f remaining conversions 2014-03-22 14:16:56 -04:00
Isaac Connor bfb52ab9aa fix groups 2014-03-21 23:10:13 -04:00
Isaac Connor 967dda737c more copying mysql2PDO from classic. Also, some fixes in classic 2014-03-21 17:16:56 -04:00
Isaac Connor c7a8c0601b wip 2014-03-21 16:51:09 -04:00
Andrew Bauer 05ebca20bc Merge pull request #349 from knnniggett/cmakeopensuse 
tie distro/opensuse folder into cmake build process
 2014-03-21 09:06:31 -05:00
m-bene da8ac0726d make db update safe to run multiple times 2014-03-20 22:02:58 +01:00
Isaac Connor ffa952419c Merge branch 'mysql2PDO' 
Conflicts:
	distros/ubuntu1204/changelog
	scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
	web/includes/actions.php
 2014-03-20 16:48:03 -04:00
m-bene 1ccef7b2c4 Revert changelog modification 2014-03-20 16:16:56 +01:00
m-bene 9ce51755ff add ExtendAlarmFrames Fields to Zones and ZonePresets 2014-03-20 10:26:48 +01:00
m-bene 2784b3d1f5 Merge master 2014-03-20 10:26:12 +01:00
m-bene 2345889d64 include ExtendAlarmFrames in Presets and enable input for preclusive zones only 2014-03-20 09:53:47 +01:00
Andrew Bauer 457e61ea42 tie distro/opensuse folder into cmake build process 2014-03-19 19:07:36 -05:00
Andrew Bauer 74347d9bbc Merge pull request #346 from knnniggett/powerpcspe 
Patch for Debian bug 736516 - FTBFS on powerpc arch.
 2014-03-19 12:12:26 -05:00
Andrew Bauer e0f8583110 Merge pull request #348 from PX03AFK/opensuse 
Initial upload for opensuse rpm
 2014-03-19 12:09:53 -05:00
Andrew Bauer fbf4de5eb2 Update Wanscam.pm 
No longer needed for zm 1.27
 2014-03-19 11:56:08 -05:00
Andrew Bauer faacea50ef Update Wanscam.pm 
Use full package name when using ZM_VERSION
 2014-03-19 11:52:58 -05:00
Isaac Connor 0cd3e33fb1 add db inserts to add WanscamPT controls 2014-03-19 12:20:19 -04:00
Isaac Connor 626c7bd6b7 pull this from the Wiki 2014-03-19 11:57:42 -04:00
root 43b259c5cd Initial upload for opensuse rpm 2014-03-18 23:31:58 -04:00
Andrew Bauer 69f6af93d1 Patch for Debian bug 736516 - FTBFS on powerpc arch. 2014-03-16 10:51:54 -05:00
Andrew Bauer 189d9938cc Add zmcamtool to autotools file manifest 2014-03-16 07:32:18 -05:00
Andrew Bauer 11fde73be1 This fixes a compile issue on i386 plaforms with the PIC compiler flag set 2014-03-15 11:38:10 -05:00
Andrew Bauer a9c83b5e71 Merge pull request #342 from knnniggett/nagyrobi 
Mostly Translation related changes
 2014-03-15 08:08:09 -05:00
Kyle Johnson 75d390d70a Merge branch 'release-1.27' 2014-03-15 00:51:13 -04:00
Kyle Johnson d37b4a2d49 Merge pull request #341 from kylejohnson/release-1.27 
Release 1.27
 2014-03-15 00:24:25 -04:00