Commit Graph

3997 Commits

Author SHA1 Message Date
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
Andrew Bauer c2b93c3caf Merge remote branch 'nagyrobi/patch-26' into nagyrobi 2014-02-26 09:32:58 -06:00
Andrew Bauer 9a298a2af2 Copy nagyrobi's localization changes from en_gb verbatim to the other language files. 2014-02-26 09:30:57 -06:00
Andrew Bauer c119c49cd9 Merge remote branch 'nagyrobi/patch-25' into nagyrobi 2014-02-26 09:21:38 -06:00
Andrew Bauer fb698a6755 Merge remote branch 'nagyrobi/patch-23' into nagyrobi 2014-02-26 09:17:14 -06:00
Andrew Bauer 5b1c79e3d0 Merge remote branch 'nagyrobi/patch-22' into nagyrobi 2014-02-26 09:16:51 -06:00
Andrew Bauer 1dd8dc4aa6 Merge remote branch 'nagyrobi/patch-21' into nagyrobi 2014-02-26 09:15:47 -06:00
Andrew Bauer f435435481 Merge remote branch 'nagyrobi/patch-17' into nagyrobi 2014-02-26 09:15:05 -06:00
Andrew Bauer 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
Andrew Bauer 805981e06a Merge remote branch 'nagyrobi/patch-4' into nagyrobi
Conflicts:
	web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
Andrew Bauer 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
Andrew Bauer 18d56e20aa Merge remote branch 'nagyrobi/patch-13' into nagyrobi 2014-02-26 08:46:21 -06:00
Andrew Bauer dee44c8f8d Merge remote branch 'nagyrobi/patch-12' into nagyrobi 2014-02-26 08:45:57 -06:00
Andrew Bauer 5ac8a5cc99 New localization strings from Nagyrobi copied verbatim from en_gb 2014-02-26 08:38:47 -06:00
Andrew Bauer 0258579ef3 Merge remote branch 'nagyrobi/patch-10' into nagyrobi 2014-02-26 08:25:16 -06:00
Andrew Bauer 5dbe34d96d This commit adds to the bottom of the presets list the default zone preset value which would come with the original fresh install. 2014-02-26 08:07:30 -06:00
Andrew Bauer e8be3cb571 Merge remote branch 'nagyrobi/patch-8' into nagyrobi 2014-02-26 07:57:42 -06:00
Andrew Bauer 4196783d97 Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts. 2014-02-26 07:56:31 -06:00
Andrew Bauer c899de65a4 Merge remote branch 'nagyrobi/patch-5' into nagyrobi 2014-02-26 07:55:36 -06:00
Andrew Bauer bc4630fddc Update local_zoneminder.te
Changes based on forum feedback
2014-02-22 15:39:10 -06:00
Andrew Bauer c3200dfec7 Update zm_create.sql.in
Enable delete filter by default.  Increase limit to 100 events.
2014-02-20 14:10:54 -06:00
Andrew Bauer 26be1bd041 Fix builtin authentication issue caused by commit 6e5d927 2014-02-14 18:56:27 -06:00
Andrew Bauer d20e0ee2e7 Temporary workaround to show all ptz control types regardless of monitor source type. 2014-02-13 08:43:19 -06:00
Kyle Johnson 2121341f65 Added an analytics image to the readme 2014-02-11 08:16:34 -05:00
Andrew Bauer ed5ae78ed1 Update README.md 2014-02-08 09:11:24 -06:00
Kyle Johnson 9d3117a428 Bumped version to 1.27 2014-02-06 22:40:16 -05:00
Kyle Johnson 7aa69dd5f3 Added CMakeLists.txt to bump-version.pl 2014-02-06 22:39:12 -05:00
Kyle Johnson 21b41f198a Initial commit of bump-version.pl 2014-02-06 22:37:16 -05:00
Anton Khirnov 296aa2517b Support building with new libavcodec versions.
CODEC_ID_* has been replaced with AV_CODEC_ID_* upstream.
2014-02-06 08:39:47 +01:00
Andrew Bauer e5ac6e95fa Update zmupdate.pl.in
mysql generates a warning, instead of an error, when trying to convert to InnoDB and that engine is not available.  By temporarily elevating warnings to errors, we can catch these rather than silently failing.
2014-02-04 15:30:04 -06:00
Andrew Bauer 4f2b09a36d remove noreplace flag on zm.conf in spec file 2014-02-01 19:30:23 -06:00
Andrew Bauer d87682e5aa Edit vlc requirements in spec files 2014-02-01 17:49:04 -06:00
Andrew Bauer b74441c08e Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2014-02-01 16:40:41 -06:00
Andrew Bauer 647cf5b180 update Fedora & CentOS README's 2014-02-01 16:39:33 -06:00
Andrew Bauer f5eedb2bfc Merge pull request #302 from pjhacnau/master
Additional compile guards to allow compilation on non-x86 archs
2014-02-01 14:02:47 -08:00
Andrew Bauer 4088f9bc00 Add libcurl requirement to rpm spec files 2014-02-01 15:01:36 -06:00
Andrew Bauer 563c526d98 Update zm_update-1.27.0.sql 2014-02-01 12:56:18 -06:00