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
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
Kyle Johnson
ab923ee960
Added lock and alter perms for the zm user to docker start script
2014-01-27 10:20:20 -05:00
Andrew Bauer
a1d2968426
Update Dockerfile
...
Latest changes to zm require zmuser to have lock tables and alter permission
2014-01-27 08:59:44 -06:00
Kyle Johnson
d1baa4e35b
Reworked Dockerfile, closer to a push-button system
2014-01-27 09:39:59 -05:00
Andrew Bauer
52794e4dad
Add vlc-devel to rpm build requirements
2014-01-26 14:02:06 -06:00
Andrew Bauer
e707e72fe3
Perl::Critic recommended a couple minor changes
2014-01-25 12:42:33 -06:00
Andrew Bauer
dbe6fc539c
Additional error checking
2014-01-25 11:26:29 -06:00
Andrew Bauer
ae1731477b
further refinements
2014-01-25 10:39:38 -06:00
Kyle Johnson
df34010f2a
Added a hack for upstart
2014-01-24 19:43:08 -05:00
Kyle Johnson
59e6ab86a0
Merge pull request #310 from kylejohnson/master
...
Enable universe in the Docker container [ci skip]
2014-01-24 11:16:35 -08:00
Kyle Johnson
b3afc7bee7
Enable universe in the Docker container [ci skip]
2014-01-24 14:14:14 -05:00
Kyle Johnson
95c317edda
Merge pull request #309 from kylejohnson/master
...
Add wget to Dockerfile prereq
2014-01-24 11:08:45 -08:00
Kyle Johnson
f434363542
Add wget to Dockerfile prereq
2014-01-24 14:08:22 -05:00
Kyle Johnson
ef6eddda51
Merge pull request #308 from kylejohnson/master
...
Add paths to flat skin in configure.ac and Makefile.am
2014-01-24 11:06:23 -08:00
Kyle Johnson
6f5c9182ce
Add paths to flat skin in configure.ac and Makefile.am
2014-01-24 13:58:51 -05:00
Kyle Johnson
066afaa689
Let the conatiner know that there is no tty
2014-01-24 13:49:27 -05:00
Kyle Johnson
635c0f5a20
Split out installing prereqs into 3 steps (DB, Apache, ZM) in Dockerfile
2014-01-24 13:48:43 -05:00
Kyle Johnson
6a9d24b957
Initial commit of Dockerfile
2014-01-24 11:03:02 -05:00
Andrew Bauer
4fe4a028f6
Update Makefile.am
...
Add flat skin to makefile
2014-01-23 14:29:35 -06:00
Kyle Johnson
8ab275ba3d
Merge pull request #303 from justinlawrence/master
...
Flat skin for ZoneMinder
2014-01-23 12:10:39 -08:00
Andrew Bauer
2037afb3ca
new subroutine runQuery
2014-01-23 08:41:47 -06:00
Peter Howard
9a31bbb4d0
zm_signal.cpp needed extra compile guards too. Confirmed building on non-x86 (ia64 for convenience)
2014-01-23 16:09:42 +11:00
Peter Howard
5786af0d4e
Added missing x86 compile guards to zm_image.cpp. This should allow ZoneMinder to at least build again on non-x86 architectures.
2014-01-23 14:49:46 +11:00
Andrew Bauer
869a139809
create rmName subroutine
2014-01-22 19:18:08 -06:00
Andy Bauer
91b0676343
Call checkName for certain reptitive tasks
2014-01-22 09:20:56 -06:00
Justin Lawrence
e8f831c055
Flat theme: rename new theme from classic copy to flat
2014-01-22 16:33:40 +02:00
Justin Lawrence
23f69de826
Flat theme: css changes
2014-01-22 16:32:14 +02:00