e00049f17a
change format to native
2015-11-16 09:30:09 -05:00
551194227d
compat for php 5.4
2015-11-15 21:40:25 +00:00
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
0ee7b3d729
add hostname to Servers table
2015-11-11 16:54:41 -05:00
5e70146b0e
Monitor->Frames, since we are updating Frames
2015-11-11 16:43:57 -05:00
fc85ccbf5f
Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.
2015-11-11 16:43:23 -05:00
ab7aa392f4
Merge pull request #1157 from ZoneMinder/fix_1156
...
remove comment at end of line
2015-11-10 14:11:49 -06:00
d231ac4533
remove comment at end of line
2015-11-10 14:46:12 -05:00
b123de3b54
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-11-10 14:45:24 -05:00
d5cc602bfa
Merge branch 'master' into multi-server
2015-11-09 12:36:34 -05:00
16274e46bc
grant create,index to zmuser when updating
2015-11-09 12:36:26 -05:00
ac76d224b8
grant create,index to zmuser when updating
2015-11-09 12:36:23 -05:00
82edfc2f16
grant create,index to zmuser when updating
2015-11-09 12:34:24 -05:00
6b994132f1
grant create,index to zmuser when updating
2015-11-09 12:34:11 -05:00
49a89b75a8
More verbose error reporting
2015-11-09 16:15:53 +01:00
3479af78bd
Add more verbose help
2015-11-06 13:36:29 -05:00
92401193a7
Add missing semicolon
2015-11-06 11:19:12 -05:00
ced0240fc3
Use the ssmtp path set in options first. shell command if ssmtp path empty. display debug suggesting set ssmtp path in option.
2015-11-06 10:43:30 -05:00
e8f31d7451
Merge pull request #1147 from SteveGilvarry/RTSPBuildWarning
...
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 10:33:59 -06:00
477e63a878
Reorder RTSPDescribe to avoid -wreorder warnings
2015-11-05 17:19:58 +11:00
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
1f1b48ed51
Added Vivotek ePTZ control to zm_create.sql
2015-11-04 19:17:47 +01:00
b611d9fcae
Bump database version to 1.28.109
2015-11-04 17:29:37 +01:00
330e0d7adf
Add Vivotek ePTZ control module to database
2015-11-04 17:29:07 +01:00
a942b22541
Add camera control module for Vivotek ePTZ protocol
2015-11-04 17:12:07 +01:00
80d3e0be80
Merge pull request #1139 from SteveGilvarry/Travis_ffmpeg2.8.1
...
Update Travis to ffmpeg 2.8.1 for testing
2015-11-04 10:01:20 -06:00
11f10e5e7c
Merge pull request #1142 from SteveGilvarry/pr/1137
...
Update to #1137 for backward compatibility.
2015-11-04 09:59:57 -06:00
4c773472bd
Add support for IPv6 in RTSP code
...
Monitors with source type 'remote' can now be accessed over IPv6. This
code uses getaddrinfo(3) now instead of gethostbyname(3) - and changes a
lot of networking stuff which should be tested thoroughly.
2015-11-04 16:41:47 +01:00
5ba13f1a76
ffmpeg 2.9 patched removed SSE2 CPU flags as these are automatically detected
...
for all ffmpeg versions circa 2010. This commit removes the if statement on
duplicated functions.
2015-11-04 16:24:39 +11:00
51914994f7
Migrating from av_free/av_freep to av_frame_free using libavcodec version
...
check. Also replaced recently deprecated av_free_packet with av_packet_unref.
2015-11-04 15:30:14 +11:00
bc5ef6c599
Handle PixelFormat to AVPixelFormat change using _AVPIXELFORMAT and version
...
check to define correctly. Also at same time define all AV_PIX_FMT_* to
PIX_FMT_*
2015-11-04 12:46:26 +11:00
5a931db956
Merge pull request #1121 from knnniggett/revproxy
...
Use relative URL's instead of absolute
2015-11-04 00:34:12 +11:00
97b70b0e28
Update Travis to ffmpeg 2.8.1 for testing
2015-11-03 14:57:35 +11:00
35617a6cf7
#1128 - Added option to enable send email by ssmtp mail. Option for custom ssmtp path. Conditional checks for new options in filter
2015-11-02 22:16:10 -05:00
0ff7a4e616
Replace deprecated FFmpeg API
...
Fixes FTBFS with ffmpeg-2.9; compatible with ffmpeg-2.8.
Author: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803850
2015-11-03 11:58:23 +11:00
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
b28a562f1b
Merge branch 'master' into multi-server
2015-10-30 12:32:42 -04:00
920bea8deb
split up depends into multiple lines
2015-10-30 12:19:43 -04:00
589ee2f37b
split up depends into multiple lines
2015-10-30 12:19:35 -04:00
a45a52601d
change format to native, which makes building packages so much easier
2015-10-30 12:19:12 -04:00
44168ce05e
Merge branch 'master' into multi-server
2015-10-30 11:29:03 -04:00
bc261c544e
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-10-30 11:28:44 -04:00
2115eacdd0
revert change to not overwite zm.conf. It's not right, and it is screwing up package building
2015-10-30 11:28:34 -04:00
a85dda3407
Merge pull request #1124 from baffo32/symlink-install
...
Install nph-zms with FILES so it is listed in install_manifest.txt
2015-10-24 21:55:47 -05:00
44cda8032b
Install nph-zms with FILES so that it is listed in install_manifest.txt and uninstalled with make uninstall
2015-10-24 20:07:42 -04:00
d47edbbb87
Merge pull request #1123 from baffo32/patch-1
...
Stray semicolon causes SQL error. Fixes #1122
2015-10-24 16:06:38 -06:00
d0ce4904ff
Stray semicolon causes SQL error
...
also normalized space around '='
2015-10-24 17:58:20 -04:00
cb7acb36ab
Use relative URL's instead of absolute
2015-10-24 13:04:54 -05:00
de3e7784d5
Merge pull request #1120 from ZoneMinder/zmupdate-url
...
Update version check URL
2015-10-23 19:02:44 -06:00
029044bca3
merge master, bump version
2015-10-23 16:14:49 -04:00
Isaac Connor
abishai
Andrew Bauer
Robin Daermann
dreaddy
SteveGilvarry
Pliable Pixels
Steve Gilvarry
Dmitry Smirnov
baffo32
Kyle Johnson