ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,745 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

5745 Commits

Author SHA1 Message Date
Steve Gilvarry 79d486b5aa Test Example of 1.29 Changelog 2015-11-22 10:21:38 +11:00
Steve Gilvarry 3112fe6279 Merge remote-tracking branch 'ZoneMinder/master' 2015-11-22 10:13:42 +11:00
Andy Bauer cbfdc5d88d rpm packaging updates 2015-11-21 15:23:13 -06:00
Andy Bauer e65f91d404 update rpm documentation 2015-11-21 15:18:43 -06:00
Andrew Bauer a9609d2a43 fix mem alloc fault in zm_monitor.cpp 2015-11-21 12:17:23 -06:00
Isaac Connor 4d6c4355db Merge branch 'master' into multi-server 2015-11-20 16:07:50 -05:00
Isaac Connor 37b041b561 add index to recommended default permissions on zmuser 2015-11-20 16:00:57 -05:00
Steve Gilvarry f01b0e84e8 Merge remote-tracking branch 'ZoneMinder/master' 2015-11-18 23:15:38 +11:00
Andy Bauer 9052274d0d Update rpm documentation to reference index permission 2015-11-17 12:20:51 -06:00
Kyle Johnson c0216f74cb Merge pull request #1164 from abishai/master 
compat for php 5.4.  Fixes #1163
 2015-11-16 09:28:03 -07:00
Kyle Johnson 5add10289b Merge pull request #1136 from pliablepixels/1135-events-API-prev-next 
added prev/next event ids
 2015-11-16 09:23:36 -07:00
Isaac Connor 7f5958d873 remove comma that shouldn't be there 2015-11-16 11:01:41 -05:00
Isaac Connor f322bde35c increase version to 109 because I at some point pushed a db update script 2015-11-16 11:01:11 -05:00
Isaac Connor e00049f17a change format to native 2015-11-16 09:30:09 -05:00
abishai 551194227d compat for php 5.4 2015-11-15 21:40:25 +00:00
Isaac Connor 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
Isaac Connor 0ee7b3d729 add hostname to Servers table 2015-11-11 16:54:41 -05:00
Isaac Connor 5e70146b0e Monitor->Frames, since we are updating Frames 2015-11-11 16:43:57 -05:00
Isaac Connor 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
Andrew Bauer ab7aa392f4 Merge pull request #1157 from ZoneMinder/fix_1156 
remove comment at end of line
 2015-11-10 14:11:49 -06:00
Isaac Connor d231ac4533 remove comment at end of line 2015-11-10 14:46:12 -05:00
Isaac Connor b123de3b54 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-11-10 14:45:24 -05:00
Isaac Connor d5cc602bfa Merge branch 'master' into multi-server 2015-11-09 12:36:34 -05:00
Isaac Connor 16274e46bc grant create,index to zmuser when updating 2015-11-09 12:36:26 -05:00
Isaac Connor ac76d224b8 grant create,index to zmuser when updating 2015-11-09 12:36:23 -05:00
Isaac Connor 82edfc2f16 grant create,index to zmuser when updating 2015-11-09 12:34:24 -05:00
Isaac Connor 6b994132f1 grant create,index to zmuser when updating 2015-11-09 12:34:11 -05:00
Robin Daermann 49a89b75a8 More verbose error reporting 2015-11-09 16:15:53 +01:00
dreaddy 3479af78bd Add more verbose help 2015-11-06 13:36:29 -05:00
dreaddy 92401193a7 Add missing semicolon 2015-11-06 11:19:12 -05:00
dreaddy 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
Andrew Bauer e8f31d7451 Merge pull request #1147 from SteveGilvarry/RTSPBuildWarning 
Reorder RTSPDescribe to avoid -wreorder warnings
 2015-11-05 10:33:59 -06:00
SteveGilvarry 477e63a878 Reorder RTSPDescribe to avoid -wreorder warnings 2015-11-05 17:19:58 +11:00
Pliable Pixels 7cbad44ae4 also return the prev and next events for the same monitor as the current event 2015-11-04 14:23:28 -05:00
Robin Daermann 1f1b48ed51 Added Vivotek ePTZ control to zm_create.sql 2015-11-04 19:17:47 +01:00
Robin Daermann b611d9fcae Bump database version to 1.28.109 2015-11-04 17:29:37 +01:00
Robin Daermann 330e0d7adf Add Vivotek ePTZ control module to database 2015-11-04 17:29:07 +01:00
Robin Daermann a942b22541 Add camera control module for Vivotek ePTZ protocol 2015-11-04 17:12:07 +01:00
Andrew Bauer 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
Andrew Bauer 11f10e5e7c Merge pull request #1142 from SteveGilvarry/pr/1137 
Update to #1137 for backward compatibility.
 2015-11-04 09:59:57 -06:00
SteveGilvarry 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
SteveGilvarry 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
SteveGilvarry 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
Steve Gilvarry 5a931db956 Merge pull request #1121 from knnniggett/revproxy 
Use relative URL's instead of absolute
 2015-11-04 00:34:12 +11:00
SteveGilvarry 97b70b0e28 Update Travis to ffmpeg 2.8.1 for testing 2015-11-03 14:57:35 +11:00
dreaddy 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
Dmitry Smirnov 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
Pliable Pixels e3d06ca103 added prev/next event ids 2015-11-02 16:54:52 -05:00
Isaac Connor b28a562f1b Merge branch 'master' into multi-server 2015-10-30 12:32:42 -04:00
Isaac Connor 920bea8deb split up depends into multiple lines 2015-10-30 12:19:43 -04:00