7ab6818fa0
Merge branch 'sanitize_image_path' of https://github.com/knnniggett/ZoneMinder into storageareas_sanitize
2017-01-25 17:14:30 -05:00
1f3644f6bd
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2017-01-16 21:14:39 -05:00
0e8d1baebb
add an urgency flag
2017-01-16 21:13:56 -05:00
5833196a84
packpack - change error code handling
2017-01-16 08:36:46 -06:00
000ba2300a
packpack - initial support for debian distros
2017-01-15 20:43:03 -06:00
5db6e8cbb3
add auto-uploading to zmrepo for jessie
2017-01-15 17:20:40 -05:00
4325e8f7ea
Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder
2017-01-15 15:49:46 -06:00
49c35d5733
packpack - f24,f25,el7 confirmed working
2017-01-15 15:48:57 -06:00
a30af05bcf
change parameters to use -o= or --option= and add interactive flag
2017-01-15 12:18:51 -05:00
b3ee97ad11
Merge pull request #1753 from jbehrends/docker_apache_fix
...
Docker - Fixed broken cgi-bin path in apache site conf.
2017-01-14 20:38:33 -06:00
41f5ee5032
Fixed broken cgi-bin path
2017-01-14 16:35:46 -08:00
08d4d0c5c2
packpack - auto retrieve zmrepo rpm
2017-01-14 16:35:56 -06:00
7d91b4cdc7
minor changes to packpack patch
2017-01-14 16:24:55 -06:00
3ae7038e3b
make the build script executable
2017-01-14 14:15:54 -06:00
105e43fafd
initial commit for packpack support
2017-01-14 14:14:41 -06:00
d7f81393a8
fixes to detect and use environment variables for AUTHOR and debsign keys
2017-01-14 10:53:05 -05:00
b8dcebadd5
remove iconnor references
2017-01-14 10:01:55 -05:00
e3f073b275
update to add binary options, dput to ppa and use alternate fork. Also support newer distros and wheezy.
2017-01-14 09:58:36 -05:00
2104561eca
Fixed apache documentroot, and fixed permissions for "/"
2017-01-11 19:49:29 -08:00
0d549f1db3
spelling fixes
2016-12-29 10:31:05 +01:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
1bdcd39a50
add quotes to handle values with spaces
2016-10-31 20:37:58 -05:00
9f84aaa537
surround variables w/quotes to process data with spaces
2016-10-31 08:46:05 -05:00
3994de1b91
Merge pull request #1583 from zhuykovkb/fix_wrong_doc_root
...
fixed wrong doc root
2016-10-20 05:31:21 +11:00
31ca095445
Update README.md
2016-08-15 04:39:04 -07:00
52ba284357
fixed wrong doc root
2016-08-06 16:20:30 +03:00
6a097393ba
Run Docker db/apache setup once, not on every startup; kill mysql cleanly
2016-06-02 12:06:21 +10:00
d2e83d197d
Improve Docker build; reduce image size & layer count
...
Reducing layer count improves Docker performance, and is best-practice.
Avoid packing & sending .git tree into Docker build system.
Clean up apt archives to reduce image size.
2016-06-02 10:51:41 +10:00
97a4cf0852
Add the changes...doh
2016-05-01 15:06:45 +10:00
7645e29913
fix distro dirs, because the cmake versions have been renamed to not have cmake in them
2016-04-06 12:27:24 -04:00
2fc1fc4380
use debian control file to auto-install deps
2016-02-22 09:18:46 -06:00
b28224cacb
Added copyright information to mk_bigfont.pl
2016-02-11 07:35:21 +01:00
226b77bb63
Added script to generate src/zm_bigfont.h
...
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
2016-02-10 11:28:56 +01:00
41acdbb480
Merge pull request #1257 from salberin/topic/docker-fixes
...
Fix docker file
2016-02-05 07:37:38 -06:00
e01547cbe4
Update timezone to GMT, reduce SHM requirement to 512M
...
Increase the SHM to 2048 if you need to support H.264 cameras
2016-02-05 14:08:43 +01:00
b0c5aa511a
Migrate to cmake for building.
...
Also ensure that content is properly symlinked.
2016-02-05 14:02:20 +01:00
dd4f92fd4c
Merge pull request #1243 from knnniggett/do_debian_script
...
use local user @ hostname.local for author
2016-02-04 11:55:14 -05:00
baa305c0ed
Increase shared memory available in docker to ensure H.264 cameras can work
...
Also enable CGI module, as zoneminder needs this for monitors
2016-02-01 12:35:45 +01:00
b99e7b6500
Prepare for new Apache 2.4 behviour in Trusty
2016-02-01 12:34:09 +01:00
0ade8abd6a
typo
2016-01-20 16:11:35 -05:00
8dd35d6057
modifications for general users
2016-01-20 16:09:12 -05:00
22ef473202
Use the full name
2016-01-19 10:22:51 -06:00
a17bde0784
update hostname logic
2016-01-19 10:13:36 -06:00
e2b00bbe1f
use local user @ hostname.local for author
2016-01-19 08:05:40 -06:00
e9c9caf201
Add a local build type
2016-01-18 21:39:33 -05:00
41a8249ed9
update my package building script
2016-01-05 09:04:04 -05:00
5ce35f147a
initial rough version
2015-08-20 20:35:01 -04:00
790ecba0b2
Move script to /utils
2014-11-15 12:48:01 -06:00
c48b039b15
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
.travis.yml
2014-10-31 12:25:57 -04:00
4cb0d7b1cd
Use full path to zm_create.sql in bootstrap-zm.sh
2014-06-27 14:13:29 -04:00
Isaac Connor
Andrew Bauer
Isaac Connor
Andy Bauer
Josh Behrends
Andrew Bauer
klemens
Steve Gilvarry
Vikas Kedia
Zhuykov Kirill
Toby
Isaac Connor
Robin Daermann
Sander Alberink
Pliable Pixels
Kyle Johnson
Kyle Johnson