clipo1979
3e03745603
Rename zoneminder.el7.conf to zoneminder.el7.conf.in
2015-02-15 11:43:10 +00:00
clipo1979
b42b646e5e
Update zoneminder.el7.conf
2015-02-15 11:39:27 +00:00
clipo1979
0991391f45
Update CMakeLists.txt
2015-02-15 11:34:27 +00:00
Andrew Bauer
c54b9aa6bc
Update zoneminder.f21.spec
...
typo
2015-02-14 11:29:34 -06:00
Andrew Bauer
9ac5b2b1c5
create zoneminder spec file for fedora 21
2015-02-14 11:25:03 -06:00
Isaac Connor
cdb5180964
bump snapshot release
2015-02-13 13:14:50 -05:00
Isaac Connor
eb73c16246
add mysql-client-5.6 as an option in depends
2015-02-13 13:06:03 -05:00
Andrew Bauer
8da2e0a667
Update CMakeLists.txt
...
ZM_CONFIG was overwriting itself
2015-02-13 07:29:21 -06:00
Andrew Bauer
8480eda48c
Update README.Centos7
2015-02-13 06:55:45 -06:00
Andrew Bauer
4d33a55f9e
Update README.Centos7
2015-02-13 06:50:50 -06:00
Andrew Bauer
f20a233ab2
Update zoneminder.el7.spec
...
move zm.conf to /etc/zm
2015-02-11 17:57:13 -06:00
Andrew Bauer
ccad736893
Update README.Centos7
2015-02-11 13:55:02 -06:00
Isaac Connor
2b53e439b9
Add Capture Resolution to replace Capture Width and Capture Height
2015-02-11 13:14:51 -05:00
Isaac Connor
4439187f19
Better debug output, handle ENOTTY in STANDARD ENUMERATION
2015-02-10 11:53:50 -05:00
Isaac Connor
dc470f155c
Merge pull request #702 from ZoneMinder/small_local_camera_improvements
...
small improvements:
2015-02-10 11:22:31 -05:00
Isaac Connor
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
Andrew Bauer
93be3975bc
Merge pull request #700 from knnniggett/centos7
...
Centos 7 rpm packaging
2015-02-09 17:53:21 -06:00
Andrew Bauer
b741da01e8
renumber the items
2015-02-09 13:36:22 -06:00
Andrew Bauer
e8732d76b9
Minor documentation tweaks
2015-02-09 13:29:21 -06:00
Andrew Bauer
8304a8d428
Update instructions in README.Centos7
2015-02-09 09:28:35 -06:00
Andrew Bauer
51bf50f79a
Add mariadb to buildrequires
2015-02-09 07:58:34 -06:00
Andrew Bauer
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
Andrew Bauer
9944a40763
Run zmupdate noninteractively following an upgrade
2015-02-08 19:08:21 -06:00
Andrew Bauer
c475cc69d2
Change zm ScriptAlias to prevent an overlap with the default ScriptAlias
2015-02-08 18:52:42 -06:00
Andrew Bauer
0cf5bc5efb
install tmpfiles config file
2015-02-08 18:16:21 -06:00
Andrew Bauer
f3671ddd8b
add ZM_TARGET_DISTRO string after else statement
2015-02-08 18:07:46 -06:00
Andrew Bauer
c619dded76
reorganize files to allow el6 and el7 files to exist simultaneously
2015-02-08 17:56:44 -06:00
Andrew Bauer
d449d00569
typo
2015-02-08 16:42:03 -06:00
Andrew Bauer
d833505664
typo
2015-02-08 16:39:59 -06:00
Andrew Bauer
72da7a0e69
process redhat subfolder when EL7 is specified
2015-02-08 16:37:29 -06:00
Andrew Bauer
9bc28c96f0
Centos 7 rpm packaging
2015-02-08 16:16:31 -06:00
Andrew Bauer
8eccc2ff9d
Update INSTALL
...
Update cmake INSTALL documentation
2015-02-08 11:30:18 -06:00
Andrew Bauer
547cb5c611
Merge pull request #699 from clipo1979/master
...
tmpfile.conf for systemd
2015-02-08 11:20:20 -06:00
clipo1979
0c257405b0
Update Makefile.am
2015-02-08 16:22:19 +00:00
clipo1979
33fef42233
Update zoneminder-tmpfiles.conf.in
2015-02-08 16:11:07 +00:00
clipo1979
6c86811ff0
Update CMakeLists.txt
2015-02-08 13:09:01 +00:00
clipo1979
efa760a3fa
Create zoneminder-tmpfiles.conf.in
2015-02-08 13:07:53 +00:00
Isaac Connor
4524a61a50
prevent error message in log when Enabled is not checked
2015-02-06 14:15:26 -05:00
Isaac Connor
fed6748c6d
fixes to format date into zero padding and year as 2 digit
2015-02-06 13:00:55 -05:00
Isaac Connor
dbac099223
we don't use EndTime so don't load it
2015-02-06 11:50:23 -05:00
Isaac Connor
bcdac0104f
pass a minimum event hash instead of the event id to deleteEvent
2015-02-06 11:50:07 -05:00
Isaac Connor
9a1e210849
add comment
2015-02-06 11:46:35 -05:00
Isaac Connor
02a6c78182
make deleteEvent take either an event object or an eid.
...
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
2015-02-06 11:41:37 -05:00
Isaac Connor
856a8ce1d0
minor improvement removing 1 coll to time()
...
improve logging tell which monitor the event belonged to
2015-02-06 09:30:48 -05:00
Isaac Connor
60d92d6a59
Add a check for librt which is needed on pi
2015-02-05 11:03:37 -05:00
Isaac Connor
4613fd46a4
fix a reorder warning
2015-02-05 11:03:26 -05:00
Andrew Bauer
92b3cdbadb
Merge pull request #691 from ZoneMinder/rtsp_auth_fixes
...
this fixes Digest Auth for the mjpeg stream on a TV-IP302PI
2015-02-04 13:46:37 -06:00
Andrew Bauer
eb18e27e44
Merge pull request #692 from ZoneMinder/contenttype_parsing_fix
...
fix content-type parsing when there are options on it
2015-02-04 13:41:45 -06:00
Isaac Connor
65701f0956
add missing +
2015-02-04 14:22:53 -05:00
Isaac Connor
4c7e8592d0
fix content-type parsing when there are options on it
2015-02-04 13:53:42 -05:00