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

5510 Commits

Author SHA1 Message Date
SteveGilvarry 5f4441878e Coded_Frame deprecation all examples were no lomger setting AV_PKT_FLAG_KEY, is it on the packet already. 2016-03-03 17:16:06 +11:00
SteveGilvarry 2122d6e443 Fix all the av_picture related deprecations 2016-03-03 01:03:55 +11:00
SteveGilvarry e70d037895 Start avpicture deprecation 2016-02-27 01:23:20 +11:00
Isaac Connor 28e94764d7 Merge pull request #1304 from knnniggett/debianscript 
use debian control file to auto-install deps
 2016-02-22 19:20:06 -05:00
Andrew Bauer 2fc1fc4380 use debian control file to auto-install deps 2016-02-22 09:18:46 -06:00
Andrew Bauer 918407bcae Merge pull request #1248 from pliablepixels/documentation 
updated documentation for ubuntu
 2016-02-22 09:05:53 -06:00
Isaac Connor b653f74b09 Merge pull request #1301 from kunkku/event-memcpy-overlap 
zm_event: fix overlap in memcpy buffers
 2016-02-20 20:43:24 -05:00
Kaarle Ritvanen 5b047dc74b zm_event: fix overlap in memcpy buffers 2016-02-20 23:58:36 +02:00
Andrew Bauer 82a130bf58 Merge pull request #1300 from ZoneMinder/zm_trigger_improvements 
Zm trigger improvements
 2016-02-19 11:50:54 -06:00
Isaac Connor 826a22a2a8 add missing . 2016-02-19 11:07:06 -05:00
Isaac Connor 3b07b56400 Use more descriptive names for the channels 2016-02-19 11:05:55 -05:00
Isaac Connor 64c5b64068 Log error before croaking and include port# in the error message 2016-02-19 11:04:02 -05:00
Isaac Connor 327a01cb20 Log error before croaking and show path to file in the error message 2016-02-19 10:59:40 -05:00
Isaac Connor 3a512f87a5 Log the reason for croaking before croaking. 2016-02-19 10:57:52 -05:00
Isaac Connor 46efe9c1e0 Merge pull request #1298 from onlyjob/jquery 
Upgrade bundled jQuery (Closes: #1263)
 2016-02-17 19:54:21 -05:00
Dmitry Smirnov 632e9c8e53 Upgrade bundled jQuery (Closes: #1263) 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-18 00:28:30 +11:00
Kyle Johnson f4d51d01a9 Merge pull request #1273 from knnniggett/enableonvif 
By default, enable ONVIF discovery support
 2016-02-16 12:53:05 -07:00
Andrew Bauer 5f771327be Merge pull request #1295 from ZoneMinder/zmdc_better_error_messages 
include the sock path in the error message and output an error on fai…
 2016-02-16 10:04:11 -06:00
Isaac Connor d1ba45c56a include the sock path in the error message and output an error on failure to open pid file 2016-02-16 10:02:30 -05:00
Isaac Connor 26f5f12190 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-02-16 09:29:57 -05:00
Isaac Connor 172a4c6bd4 Add montagereview.php to autotools build. 2016-02-16 09:29:49 -05:00
Isaac Connor 6f221ed269 Merge pull request #1278 from schrorg/bigfont-license 
Added script to generate src/zm_bigfont.h
 2016-02-16 09:17:54 -05:00
Isaac Connor e2f88f6bb6 Merge pull request #1293 from kunkku/memcpy-overlap 
zm_monitor: fix overlap in memcpy buffers
 2016-02-16 09:16:04 -05:00
Isaac Connor b3f5c10591 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-02-16 08:59:56 -05:00
Kaarle Ritvanen 6332f28c53 zm_monitor: fix overlap in memcpy buffers 
behavior undefined by POSIX and causes a crash with FORTIFY_SOURCE
 2016-02-16 11:47:49 +02:00
Andy Bauer 37c7b71b03 add out-of-source build support to onvif/scripts folder 2016-02-13 15:26:31 -06:00
Isaac Connor f9b3287539 Merge pull request #1283 from pliablepixels/1282-multiserver-debug-demote 
demoted to debug due to lots of logs
 2016-02-11 17:08:56 -05:00
arjunrc e8c38dd016 demoted to debug due to lots of logs 2016-02-11 15:12:21 -05:00
Robin Daermann b28224cacb Added copyright information to mk_bigfont.pl 2016-02-11 07:35:21 +01:00
Andrew Bauer 51a4298fc7 Merge pull request #1280 from altaroca/1272-onvif-copyright 
1272 onvif copyright
 2016-02-10 12:03:08 -06:00
Jan M. Hochstein 61932a6470 Corrected file copyrights 2016-02-10 16:36:21 +01:00
Jan M. Hochstein ee48c830d0 Added README and removed WSDL files in onvif folder 2016-02-10 16:25:23 +01:00
Jan M. Hochstein 2b9693748b Added README and removed WSDL files in onvif folder 2016-02-10 16:22:34 +01:00
Robin Daermann 226b77bb63 Added script to generate src/zm_bigfont.h 
Also added a line to the header of src/zm_bigfont.h on how it is
generated.
 2016-02-10 11:28:56 +01:00
Andy Bauer cb1514193f Merge branch 'schrorg-vivotek-ePTZ' 2016-02-09 06:57:05 -06:00
Andy Bauer b718bd298f Merge branch 'vivotek-ePTZ' of https://github.com/schrorg/ZoneMinder into schrorg-vivotek-ePTZ 2016-02-09 06:56:38 -06:00
Andrew Bauer 0b2a309014 Merge pull request #961 from Linwood-F/960-montage-review-new-feature 
960 montage review new feature
 2016-02-08 20:40:04 -06:00
Andrew Bauer 308d98955e By default, enable ONVIF discovery support 2016-02-08 14:05:06 -06:00
Isaac Connor a2ae29dfbe Add php5-gd to depends 2016-02-08 09:47:52 -05:00
Isaac Connor a5c1533ab1 Merge pull request #1266 from onlyjob/codespell 
codespell: misc. spelling corrections
 2016-02-08 09:36:44 -05:00
Dmitry Smirnov 0f63f4357d sphinx: fix warning "Title underline too short". 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-08 21:06:21 +11:00
Dmitry Smirnov 5bcc414038 codespell: misc. spelling corrections 
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
 2016-02-08 20:41:36 +11:00
Andrew Bauer 41acdbb480 Merge pull request #1257 from salberin/topic/docker-fixes 
Fix docker file
 2016-02-05 07:37:38 -06:00
Sander Alberink e01547cbe4 Update timezone to GMT, reduce SHM requirement to 512M 
Increase the SHM to 2048 if you need to support H.264 cameras
 2016-02-05 14:08:43 +01:00
Sander Alberink b0c5aa511a Migrate to cmake for building. 
Also ensure that content is properly symlinked.
 2016-02-05 14:02:20 +01:00
Isaac Connor 9ace6c518d Merge pull request #1225 from Simpler1/profiles 
Added profiles for Wanscam-HW0025 and IPCC-7210W
 2016-02-04 11:55:48 -05:00
Isaac Connor dd4f92fd4c Merge pull request #1243 from knnniggett/do_debian_script 
use local user @ hostname.local for author
 2016-02-04 11:55:14 -05:00
Isaac Connor d3755611c5 Merge pull request #1247 from bodegard/master 
Corrected DB update version comments, fixed typos, and skin font modification
 2016-02-04 11:54:02 -05:00
Isaac Connor 52e16dbdd0 Merge pull request #1249 from knnniggett/pelcop 
Fix PelcoP checksum calculation
 2016-02-04 11:52:51 -05:00
Andrew Bauer ab7b4ab3e6 Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated 
implement Width and Height functions, and test for image rotation and…
 2016-02-04 10:17:19 -06:00