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
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
6f5c9182ce
Add paths to flat skin in configure.ac and Makefile.am
2014-01-24 13:58:51 -05:00
066afaa689
Let the conatiner know that there is no tty
2014-01-24 13:49:27 -05:00
635c0f5a20
Split out installing prereqs into 3 steps (DB, Apache, ZM) in Dockerfile
2014-01-24 13:48:43 -05:00
6a9d24b957
Initial commit of Dockerfile
2014-01-24 11:03:02 -05:00
4fe4a028f6
Update Makefile.am
...
Add flat skin to makefile
2014-01-23 14:29:35 -06:00
8ab275ba3d
Merge pull request #303 from justinlawrence/master
...
Flat skin for ZoneMinder
2014-01-23 12:10:39 -08:00
2037afb3ca
new subroutine runQuery
2014-01-23 08:41:47 -06:00
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
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
869a139809
create rmName subroutine
2014-01-22 19:18:08 -06:00
91b0676343
Call checkName for certain reptitive tasks
2014-01-22 09:20:56 -06:00
e8f831c055
Flat theme: rename new theme from classic copy to flat
2014-01-22 16:33:40 +02:00
23f69de826
Flat theme: css changes
2014-01-22 16:32:14 +02:00
ce825067a8
Flat theme
2014-01-22 16:24:06 +02:00
f00e72be1e
Initial commit for new zmcamtool.pl script
2014-01-21 16:22:30 -06:00
ed40ee4d11
Update zm_create.sql.in
...
Fix typo created during a manual merge
2014-01-17 09:54:37 -06:00
b2b9f3f466
Merge branch 'master' of https://github.com/Tim-Craig/ZoneMinder into Tim-Craig-master
...
Conflicts:
db/zm_create.sql.in
2014-01-17 09:50:05 -06:00
532d1ba413
Update zm_create.sql.in
...
Don't explicitly set the Id number of each ptz control. The auto increment flag has previously been turned on so mysql will insert the proper value for us when we create a new record. This will make the list of ptz controls easier to manager as the list gets bigger.
2014-01-17 08:42:26 -06:00
c2a0c5917d
Update zm_create.sql.in
...
Changed the CaSe on a few INSERT INTO statements for consistency.
2014-01-17 08:38:54 -06:00
10ebb7442c
Update zm_create.sql.in
...
When creating a new dB, we should drop the Logs table if it already exists, just like we do with the other tables.
2014-01-17 08:35:37 -06:00
05e395613b
Adding PTZ module for Toshiba IK-WB11A
2014-01-14 00:58:12 -08:00
784f9d925c
Remove src/zm_config_defines.h from repository as its not needed, its generated by zmconfgen.pl and will cause conflicts when doing an out-of-source build
2014-01-12 13:27:59 +02:00
a74b22a5ed
Merge pull request #297 from ZoneMinder/curl
...
Add cURL source type
2014-01-11 06:04:03 -08:00
3ded7276e1
Attempt to fix zmu "Error, failed to enumerate standard X: Success"
...
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21803
2014-01-10 13:40:52 +02:00
936198de85
Fix typo
2014-01-10 09:27:55 +02:00
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
21f7ec12eb
Added useful string functions that will be used later on for rtsp digest authentication
2014-01-08 15:57:17 +02:00
5ccfa305d3
Merge pull request #294 from knnniggett/glob_ptz_scripts
...
glob ptz scripts under control folder
2014-01-06 08:50:48 -08:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
e202cdb6d0
Fixed digest authentication and minor changes
2014-01-05 10:15:28 +02:00
a962815624
Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one
2014-01-05 08:59:09 +02:00
faaf237731
Revert "Broke zmfilter.pl.in in order to test travis"
...
This reverts commit acc158f3cb
2014-01-04 15:10:15 -05:00
Kyle Johnson
Andrew Bauer
Kyle Johnson
Peter Howard
Peter Howard
Andy Bauer
Justin Lawrence
tim
Kfir Itzhak