a219915702
Merge pull request #1 from knnniggett/clipo1979-master
...
Looks good, I was thinking about the changes you've done but didnt want to go to far with my initial offerings
2015-02-18 18:15:30 +00:00
6c65c89643
Merge pull request #711 from SteveGilvarry/720_avformat_free_context_version_check
...
Fixes #710 Added libavformat version check around free context functions
2015-02-18 07:26:18 -06:00
83cc398a24
Added libavformat version check around free context functions
2015-02-18 23:25:31 +11:00
13c6be548d
If type -p doesn't work, try which, and if that doesn't work just try /usr/sbin/arp. Also don't bother with escapeshellcmd because these are not user inputs.
2015-02-17 15:39:59 -05:00
e807560d86
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-02-17 11:47:30 -05:00
e3351441c7
fix cmake error, rename init script to zoneminder, modify el6 target distro
2015-02-15 15:59:58 -06:00
18abb3761d
Update CMakeLists.txt
2015-02-15 15:50:21 +00:00
e762a615d3
Rename zoneminder.el6.conf to zoneminder.el6.conf.in
2015-02-15 15:48:40 +00:00
c6f256fef4
Rename zoneminder.el6.logrotate to zoneminder.el6.logrotate.in
2015-02-15 15:48:14 +00:00
aa00de486b
Rename zoneminder.el7.logrotate to zoneminder.el7.logrotate.in
2015-02-15 15:47:42 +00:00
200f48da34
Rename zoneminder.tmpfiles to zoneminder.tmpfiles.in
2015-02-15 15:46:00 +00:00
4fc4789b08
Update zoneminder.el6.conf
2015-02-15 14:23:28 +00:00
813de8540f
Update zoneminder.el6.logrotate
2015-02-15 14:21:16 +00:00
160503df14
Update zoneminder.el7.logrotate
2015-02-15 14:20:23 +00:00
6b8ce2e0d4
Rename zoneminder.in to zm.in
2015-02-15 14:06:54 +00:00
e80702bb22
Update CMakeLists.txt
2015-02-15 14:03:06 +00:00
5f96882ec7
Update CMakeLists.txt
2015-02-15 14:00:34 +00:00
39c5d3ad06
Update zoneminder.tmpfiles
2015-02-15 13:48:46 +00:00
308a8b9df3
Update CMakeLists.txt
2015-02-15 13:34:17 +00:00
12964f5635
Update CMakeLists.txt
2015-02-15 11:44:46 +00:00
3e03745603
Rename zoneminder.el7.conf to zoneminder.el7.conf.in
2015-02-15 11:43:10 +00:00
b42b646e5e
Update zoneminder.el7.conf
2015-02-15 11:39:27 +00:00
0991391f45
Update CMakeLists.txt
2015-02-15 11:34:27 +00:00
c54b9aa6bc
Update zoneminder.f21.spec
...
typo
2015-02-14 11:29:34 -06:00
9ac5b2b1c5
create zoneminder spec file for fedora 21
2015-02-14 11:25:03 -06:00
cdb5180964
bump snapshot release
2015-02-13 13:14:50 -05:00
eb73c16246
add mysql-client-5.6 as an option in depends
2015-02-13 13:06:03 -05:00
8da2e0a667
Update CMakeLists.txt
...
ZM_CONFIG was overwriting itself
2015-02-13 07:29:21 -06:00
8480eda48c
Update README.Centos7
2015-02-13 06:55:45 -06:00
4d33a55f9e
Update README.Centos7
2015-02-13 06:50:50 -06:00
f20a233ab2
Update zoneminder.el7.spec
...
move zm.conf to /etc/zm
2015-02-11 17:57:13 -06:00
ccad736893
Update README.Centos7
2015-02-11 13:55:02 -06:00
2b53e439b9
Add Capture Resolution to replace Capture Width and Capture Height
2015-02-11 13:14:51 -05:00
4439187f19
Better debug output, handle ENOTTY in STANDARD ENUMERATION
2015-02-10 11:53:50 -05:00
dc470f155c
Merge pull request #702 from ZoneMinder/small_local_camera_improvements
...
small improvements:
2015-02-10 11:22:31 -05:00
e713aa44f4
small improvements:
...
First is some more debugging lines useful for figuring out why automatica palette selection didn't work.
The other is a comment about how the code will segfault if there are more than 64 formats. Currently there are not.
Lastly witch a variable from int to unsigned int. There is no way for it to go negative and logically should always be positive, so by making it an unsigned in we don't have to cast it later.
2015-02-10 11:11:54 -05:00
93be3975bc
Merge pull request #700 from knnniggett/centos7
...
Centos 7 rpm packaging
2015-02-09 17:53:21 -06:00
b741da01e8
renumber the items
2015-02-09 13:36:22 -06:00
e8732d76b9
Minor documentation tweaks
2015-02-09 13:29:21 -06:00
8304a8d428
Update instructions in README.Centos7
2015-02-09 09:28:35 -06:00
51bf50f79a
Add mariadb to buildrequires
2015-02-09 07:58:34 -06:00
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
9944a40763
Run zmupdate noninteractively following an upgrade
2015-02-08 19:08:21 -06:00
c475cc69d2
Change zm ScriptAlias to prevent an overlap with the default ScriptAlias
2015-02-08 18:52:42 -06:00
0cf5bc5efb
install tmpfiles config file
2015-02-08 18:16:21 -06:00
f3671ddd8b
add ZM_TARGET_DISTRO string after else statement
2015-02-08 18:07:46 -06:00
c619dded76
reorganize files to allow el6 and el7 files to exist simultaneously
2015-02-08 17:56:44 -06:00
d449d00569
typo
2015-02-08 16:42:03 -06:00
d833505664
typo
2015-02-08 16:39:59 -06:00
72da7a0e69
process redhat subfolder when EL7 is specified
2015-02-08 16:37:29 -06:00
clipo1979
Andrew Bauer
SteveGilvarry
Isaac Connor
Andrew Bauer
Isaac Connor