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

5476 Commits

Author SHA1 Message Date
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
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
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
Isaac Connor 589ee2f37b split up depends into multiple lines 2015-10-30 12:19:35 -04:00
Isaac Connor a45a52601d change format to native, which makes building packages so much easier 2015-10-30 12:19:12 -04:00
Isaac Connor 44168ce05e Merge branch 'master' into multi-server 2015-10-30 11:29:03 -04:00
Isaac Connor bc261c544e Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-10-30 11:28:44 -04:00
Isaac Connor 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
Andrew Bauer 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
baffo32 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
Kyle Johnson d47edbbb87 Merge pull request #1123 from baffo32/patch-1 
Stray semicolon causes SQL error.  Fixes #1122
 2015-10-24 16:06:38 -06:00
baffo32 d0ce4904ff Stray semicolon causes SQL error 
also normalized space around '='
 2015-10-24 17:58:20 -04:00
Andy Bauer cb7acb36ab Use relative URL's instead of absolute 2015-10-24 13:04:54 -05:00
Kyle Johnson de3e7784d5 Merge pull request #1120 from ZoneMinder/zmupdate-url 
Update version check URL
 2015-10-23 19:02:44 -06:00
Isaac Connor 029044bca3 merge master, bump version 2015-10-23 16:14:49 -04:00
Isaac Connor e37cf0e218 append /www to docroot for all debian/ubuntu dists 2015-10-23 16:08:32 -04:00
Kyle Johnson 1cce60f6ec Update version check URL 2015-10-23 11:45:32 -06:00
Andrew Bauer 5608884bfa Merge pull request #1116 from ZoneMinder/add-index-to-frames 
Add index to frames
 2015-10-22 13:28:04 -05:00
Kyle Johnson 030792d861 Remove files accidentally added in 9dcb3e1df3 2015-10-22 12:15:38 -06:00
Kyle Johnson e51ff0677f Fix typo in Frames index creation. I hope 2015-10-22 12:12:56 -06:00