0258579ef3
Merge remote branch 'nagyrobi/patch-10' into nagyrobi
2014-02-26 08:25:16 -06:00
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
e8be3cb571
Merge remote branch 'nagyrobi/patch-8' into nagyrobi
2014-02-26 07:57:42 -06:00
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
c899de65a4
Merge remote branch 'nagyrobi/patch-5' into nagyrobi
2014-02-26 07:55:36 -06:00
bc4630fddc
Update local_zoneminder.te
...
Changes based on forum feedback
2014-02-22 15:39:10 -06:00
c3200dfec7
Update zm_create.sql.in
...
Enable delete filter by default. Increase limit to 100 events.
2014-02-20 14:10:54 -06:00
26be1bd041
Fix builtin authentication issue caused by commit 6e5d927
2014-02-14 18:56:27 -06:00
d20e0ee2e7
Temporary workaround to show all ptz control types regardless of monitor source type.
2014-02-13 08:43:19 -06:00
2121341f65
Added an analytics image to the readme
2014-02-11 08:16:34 -05:00
ed5ae78ed1
Update README.md
2014-02-08 09:11:24 -06:00
9d3117a428
Bumped version to 1.27
2014-02-06 22:40:16 -05:00
7aa69dd5f3
Added CMakeLists.txt to bump-version.pl
2014-02-06 22:39:12 -05:00
21b41f198a
Initial commit of bump-version.pl
2014-02-06 22:37:16 -05:00
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
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
4f2b09a36d
remove noreplace flag on zm.conf in spec file
2014-02-01 19:30:23 -06:00
d87682e5aa
Edit vlc requirements in spec files
2014-02-01 17:49:04 -06:00
b74441c08e
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2014-02-01 16:40:41 -06:00
647cf5b180
update Fedora & CentOS README's
2014-02-01 16:39:33 -06:00
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
4088f9bc00
Add libcurl requirement to rpm spec files
2014-02-01 15:01:36 -06:00
563c526d98
Update zm_update-1.27.0.sql
2014-02-01 12:56:18 -06:00
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
22b54dd046
Bump spec files revision to 1.27
2014-02-01 12:24:30 -06:00
f5ce597609
final cleanup and changes before 1.27 release
2014-02-01 12:17:46 -06:00
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
64686a3c60
Merge pull request #317 from kylejohnson/master
...
Example script to react to monitor alarms
2014-01-28 05:22:36 -08:00
adaad5d692
Merge pull request #316 from nereocystis/camera-comments
...
Change comments for many Camera subclasses
2014-01-28 05:16:21 -08:00
acec96a1a9
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-01-28 08:13:55 -05:00
c492d421e5
Initial commit of zm-alarm.pl, example script to react to monitor alarms
2014-01-28 08:13:44 -05:00
af7a49d8d0
Change comments for many Camera subclasses so that comments match the subclass.
2014-01-27 16:52:46 -08:00
1bae37cd05
Merge pull request #314 from kylejohnson/master
...
Fixes #313 , initial commit of 'working' dockerfile
2014-01-27 12:47:27 -08:00
bb2f08ca54
Merge branch 'master' of github.com:kylejohnson/ZoneMinder
2014-01-27 14:40:34 -05:00
ffa18a6ceb
Xdditional Makefile.am pointing to classic skin in flat skin. Fixes #313
2014-01-27 14:31:43 -05:00
6e9da046b8
Fixed additional Makefile.am pointing to classic skin in flat skin
2014-01-27 14:26:03 -05:00
1129f268e1
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
...
Conflicts:
Dockerfile
2014-01-27 14:24:33 -05:00
61c5658abf
Added a readme for the Docker stuff
2014-01-27 14:03:51 -05:00
ab923ee960
Added lock and alter perms for the zm user to docker start script
2014-01-27 10:20:20 -05:00
a1d2968426
Update Dockerfile
...
Latest changes to zm require zmuser to have lock tables and alter permission
2014-01-27 08:59:44 -06:00
d1baa4e35b
Reworked Dockerfile, closer to a push-button system
2014-01-27 09:39:59 -05:00
52794e4dad
Add vlc-devel to rpm build requirements
2014-01-26 14:02:06 -06:00
e707e72fe3
Perl::Critic recommended a couple minor changes
2014-01-25 12:42:33 -06:00
dbe6fc539c
Additional error checking
2014-01-25 11:26:29 -06:00
ae1731477b
further refinements
2014-01-25 10:39:38 -06:00
df34010f2a
Added a hack for upstart
2014-01-24 19:43:08 -05:00
59e6ab86a0
Merge pull request #310 from kylejohnson/master
...
Enable universe in the Docker container [ci skip]
2014-01-24 11:16:35 -08:00
b3afc7bee7
Enable universe in the Docker container [ci skip]
2014-01-24 14:14:14 -05:00
95c317edda
Merge pull request #309 from kylejohnson/master
...
Add wget to Dockerfile prereq
2014-01-24 11:08:45 -08:00
f434363542
Add wget to Dockerfile prereq
2014-01-24 14:08:22 -05:00
Andrew Bauer
Kyle Johnson
Kyle Johnson
Anton Khirnov
Kevin Dalley