bfb52ab9aa
fix groups
2014-03-21 23:10:13 -04:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
c7a8c0601b
wip
2014-03-21 16:51:09 -04:00
05ebca20bc
Merge pull request #349 from knnniggett/cmakeopensuse
...
tie distro/opensuse folder into cmake build process
2014-03-21 09:06:31 -05:00
da8ac0726d
make db update safe to run multiple times
2014-03-20 22:02:58 +01:00
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
1ccef7b2c4
Revert changelog modification
2014-03-20 16:16:56 +01:00
9ce51755ff
add ExtendAlarmFrames Fields to Zones and ZonePresets
2014-03-20 10:26:48 +01:00
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
2345889d64
include ExtendAlarmFrames in Presets and enable input for preclusive zones only
2014-03-20 09:53:47 +01:00
457e61ea42
tie distro/opensuse folder into cmake build process
2014-03-19 19:07:36 -05:00
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
e0f8583110
Merge pull request #348 from PX03AFK/opensuse
...
Initial upload for opensuse rpm
2014-03-19 12:09:53 -05:00
fbf4de5eb2
Update Wanscam.pm
...
No longer needed for zm 1.27
2014-03-19 11:56:08 -05:00
faacea50ef
Update Wanscam.pm
...
Use full package name when using ZM_VERSION
2014-03-19 11:52:58 -05:00
0cd3e33fb1
add db inserts to add WanscamPT controls
2014-03-19 12:20:19 -04:00
626c7bd6b7
pull this from the Wiki
2014-03-19 11:57:42 -04:00
43b259c5cd
Initial upload for opensuse rpm
2014-03-18 23:31:58 -04:00
69f6af93d1
Patch for Debian bug 736516 - FTBFS on powerpc arch.
2014-03-16 10:51:54 -05:00
189d9938cc
Add zmcamtool to autotools file manifest
2014-03-16 07:32:18 -05:00
11fde73be1
This fixes a compile issue on i386 plaforms with the PIC compiler flag set
2014-03-15 11:38:10 -05:00
a9c83b5e71
Merge pull request #342 from knnniggett/nagyrobi
...
Mostly Translation related changes
2014-03-15 08:08:09 -05:00
75d390d70a
Merge branch 'release-1.27'
2014-03-15 00:51:13 -04:00
d37b4a2d49
Merge pull request #341 from kylejohnson/release-1.27
...
Release 1.27
2014-03-15 00:24:25 -04:00
acb4ec4810
Merge branch 'release-1.27' of github.com:kylejohnson/ZoneMinder into release-1.27
2014-03-15 04:23:19 +00:00
0fc3db27f3
Merge branch 'release-1.27' of github.com:ZoneMinder/ZoneMinder into release-1.27
2014-03-15 04:22:53 +00:00
a1304222e3
Merge branch 'release-1.27' of github.com:ZoneMinder/ZoneMinder into release-1.27
2014-03-15 03:18:29 +00:00
c553bbf98d
Use the right libcurl package
2014-03-14 12:24:12 -04:00
fb0d9d063c
Added the vlc sourcetype prereqs
2014-03-14 12:02:37 -04:00
f8f0ec57dc
further refinement of build requirements
2014-03-14 06:56:05 -05:00
9f616c0d2b
Make httpd both an install and build requirement
2014-03-12 06:58:53 -05:00
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
a5d1f2afb7
Create a hardened build per Fedora packaging guidelines
2014-03-11 19:01:32 -05:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
16c59f7cb0
Update README.Fedora
...
typo
2014-03-08 14:04:40 -06:00
52fd276102
Update README.md
2014-03-08 11:01:13 -06:00
6ad6851661
Update README.md
2014-03-08 10:49:57 -06:00
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
5a2009a143
Fix popup sizes in flat skins. Fixes #331
2014-03-03 21:26:18 -05:00
03ded1edd0
Merge remote branch 'nagyrobi/patch-2' into nagyrobi
...
Conflicts:
web/lang/hu_hu.php
2014-02-26 09:37:41 -06:00
c2b93c3caf
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
2014-02-26 09:32:58 -06:00
9a298a2af2
Copy nagyrobi's localization changes from en_gb verbatim to the other language files.
2014-02-26 09:30:57 -06:00
c119c49cd9
Merge remote branch 'nagyrobi/patch-25' into nagyrobi
2014-02-26 09:21:38 -06:00
fb698a6755
Merge remote branch 'nagyrobi/patch-23' into nagyrobi
2014-02-26 09:17:14 -06:00
5b1c79e3d0
Merge remote branch 'nagyrobi/patch-22' into nagyrobi
2014-02-26 09:16:51 -06:00
1dd8dc4aa6
Merge remote branch 'nagyrobi/patch-21' into nagyrobi
2014-02-26 09:15:47 -06:00
f435435481
Merge remote branch 'nagyrobi/patch-17' into nagyrobi
2014-02-26 09:15:05 -06:00
b4679f0a8c
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
...
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.
These definitions are removed from here and added with checking option to the later stage after loading the language files.
2014-02-26 09:14:04 -06:00
805981e06a
Merge remote branch 'nagyrobi/patch-4' into nagyrobi
...
Conflicts:
web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
15f014eb8b
Changes from nagyrobi:
...
Todays computer hardware and internet speeds allow for a much more responsive user interface to be ran. I suggest to optimize these values in the "High bandwidth" profile for today's technology. These values were established at least 8 years ago... There's no risk for the user because on a fresh install and new logins, new browsers "Low bandwidth" is always the default. Optimizing these values produce no noticeable load increase on modern hardware, and a snapy, pleasant user interface if desired.
Also increased event image digits because I often run into situations where very long events run out of file naming digits (max 999 files is too short, that's only 40 seconds).
2014-02-26 09:00:10 -06:00
Isaac Connor
Andrew Bauer
m-bene
root
Kyle Johnson
Kyle Johnson
Ubuntu