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 |
Kyle Johnson
|
acb4ec4810
|
Merge branch 'release-1.27' of github.com:kylejohnson/ZoneMinder into release-1.27
|
2014-03-15 04:23:19 +00:00 |
Kyle Johnson
|
0fc3db27f3
|
Merge branch 'release-1.27' of github.com:ZoneMinder/ZoneMinder into release-1.27
|
2014-03-15 04:22:53 +00:00 |
Ubuntu
|
a1304222e3
|
Merge branch 'release-1.27' of github.com:ZoneMinder/ZoneMinder into release-1.27
|
2014-03-15 03:18:29 +00:00 |
Kyle Johnson
|
c553bbf98d
|
Use the right libcurl package
|
2014-03-14 12:24:12 -04:00 |
Kyle Johnson
|
fb0d9d063c
|
Added the vlc sourcetype prereqs
|
2014-03-14 12:02:37 -04:00 |
Andrew Bauer
|
f8f0ec57dc
|
further refinement of build requirements
|
2014-03-14 06:56:05 -05:00 |
Andrew Bauer
|
9f616c0d2b
|
Make httpd both an install and build requirement
|
2014-03-12 06:58:53 -05:00 |
Andrew Bauer
|
f9fab8d487
|
Need to make httpd a build requirement for cmake builds so the apache user can be properly auto-detected
|
2014-03-11 20:38:51 -05:00 |
Andrew Bauer
|
a5d1f2afb7
|
Create a hardened build per Fedora packaging guidelines
|
2014-03-11 19:01:32 -05:00 |
m-bene
|
26777487dc
|
add feature to extend preclusive zone alarm state by x frames
|
2014-03-09 17:05:39 +01:00 |
Andrew Bauer
|
16c59f7cb0
|
Update README.Fedora
typo
|
2014-03-08 14:04:40 -06:00 |
Andrew Bauer
|
52fd276102
|
Update README.md
|
2014-03-08 11:01:13 -06:00 |
Andrew Bauer
|
6ad6851661
|
Update README.md
|
2014-03-08 10:49:57 -06:00 |
Kyle Johnson
|
35b0823f65
|
Merge pull request #334 from kylejohnson/release-1.27
Fix popup sizes in flat skins. Fixes #331
|
2014-03-07 23:02:30 -05:00 |
Kyle Johnson
|
5a2009a143
|
Fix popup sizes in flat skins. Fixes #331
|
2014-03-03 21:26:18 -05:00 |
Andrew Bauer
|
03ded1edd0
|
Merge remote branch 'nagyrobi/patch-2' into nagyrobi
Conflicts:
web/lang/hu_hu.php
|
2014-02-26 09:37:41 -06:00 |