mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-15 20:37:51 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,334 Commits 80 Branches 104 Tags
03ded1edd0e4ad8cf24cd1f689a45cd0fda2271c
Commit Graph

3334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Andrew Bauer
5978f69af4 Rename zm_update-1.26.6.sql to zm_update-1.27.0.sql 
Renamed to reflect 1.27 release
 2014-02-01 12:56:01 -06:00
Andrew Bauer
22b54dd046 Bump spec files revision to 1.27 2014-02-01 12:24:30 -06:00
Andrew Bauer
f5ce597609 final cleanup and changes before 1.27 release 2014-02-01 12:17:46 -06:00
Andrew Bauer
23144606dc Merge pull request #318 from ZoneMinder/zmcamtool 
zmcamtool.pl - import and export ptz camera controls & camera presets
 2014-01-29 07:34:40 -08:00
Kyle Johnson
64686a3c60 Merge pull request #317 from kylejohnson/master 
Example script to react to monitor alarms
 2014-01-28 05:22:36 -08:00
Kyle Johnson
adaad5d692 Merge pull request #316 from nereocystis/camera-comments 
Change comments for many Camera subclasses
 2014-01-28 05:16:21 -08:00
Kyle Johnson
acec96a1a9 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2014-01-28 08:13:55 -05:00
Kyle Johnson
c492d421e5 Initial commit of zm-alarm.pl, example script to react to monitor alarms 2014-01-28 08:13:44 -05:00
Kevin Dalley
af7a49d8d0 Change comments for many Camera subclasses so that comments match the subclass. 2014-01-27 16:52:46 -08:00
Kyle Johnson
1bae37cd05 Merge pull request #314 from kylejohnson/master 
Fixes #313, initial commit of 'working' dockerfile
 2014-01-27 12:47:27 -08:00
Kyle Johnson
bb2f08ca54 Merge branch 'master' of github.com:kylejohnson/ZoneMinder 2014-01-27 14:40:34 -05:00
Kyle Johnson
ffa18a6ceb Xdditional Makefile.am pointing to classic skin in flat skin. Fixes #313 2014-01-27 14:31:43 -05:00
Kyle Johnson
6e9da046b8 Fixed additional Makefile.am pointing to classic skin in flat skin 2014-01-27 14:26:03 -05:00
Kyle Johnson
1129f268e1 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 
Conflicts:
	Dockerfile
 2014-01-27 14:24:33 -05:00
Kyle Johnson
61c5658abf Added a readme for the Docker stuff 2014-01-27 14:03:51 -05:00