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

6509 Commits

Author SHA1 Message Date
Steve Gilvarry 14437189ca Merge pull request #5 from knnniggett/patch-1 
Update zoneminder.init
 2016-07-18 21:04:51 +10:00
Steve Gilvarry d9292319fd Merge pull request #1563 from SteveGilvarry/feature-h264-videostorage 
Merge Master to feature-h264-videostorage
 2016-07-17 10:02:14 +10:00
Steve Gilvarry b9a48eb464 Pass swscale_ctx back in to getCachedContext or it will create new 
context every frame and leak memory like a mofo.
 2016-07-17 08:11:53 +10:00
Dmitry Smirnov aed3c3d29a reduce noise on "zmupdate.pl" invocation 2016-07-14 00:43:32 +10:00
Dmitry Smirnov f1acc52913 spellcheck/codespell 2016-07-14 00:30:39 +10:00
Steve Gilvarry b05eabfe1d Forgot that I was trying to solve case of stream is true and record_audio 
is false.
 2016-07-13 08:31:10 +10:00
Andrew Bauer 59cc952cef Merge pull request #1557 from ZoneMinder/fix_zmvideo 
restore the behaviour where the generated file names are printed to stdout
 2016-07-12 15:06:57 -05:00
Isaac Connor 85c0377280 When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it 2016-07-12 14:21:54 -04:00
Steve Gilvarry f1b9e1205a Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio 2016-07-12 23:13:02 +10:00
Isaac Connor 6129732e61 restore the behaviour where the generated file names are printed to stdout. 2016-07-11 08:01:43 -04:00
Steve Gilvarry 5d2ece0063 Why are these failing 2016-07-10 11:57:08 +10:00
Andy Bauer 19265b631a custom banner text on web console 2016-07-09 13:11:30 -05:00
Steve Gilvarry 25f7a8cadf Restore lost fixes for deprecation 2016-07-09 22:31:01 +10:00
Steve Gilvarry 142784746c Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-07-07 19:33:04 +10:00
Andrew Bauer 477c02382b Update CMakeLists.txt 
Minor change for fedora rpmbuild
 2016-07-06 19:06:28 -05:00
Steve Gilvarry 4873683f01 Merge pull request #1548 from knnniggett/libjpegturbo 
fix jpeg buffer too small
 2016-07-07 00:13:54 +10:00
Andrew Bauer 1f060f1938 Update zoneminder.init 
Remove my initials
 2016-07-05 11:35:08 -05:00
Andrew Bauer 257ce2b9a9 Merge pull request #1546 from SteveGilvarry/DocsUpdate 
Updates to Ubuntu and Debian install guides
 2016-07-05 09:30:45 -05:00
Steve Gilvarry 5811ba7eda Swap to apt-get for debian 2016-07-05 23:10:03 +10:00
Steve Gilvarry 3a40f39d83 Fix 14.04 php.ini location and some more formatting issues 2016-07-05 07:52:37 +10:00
Steve Gilvarry 1f53377d8a Implement suggested wait for MySQL start 2016-07-05 07:28:52 +10:00
Steve Gilvarry 219289ee20 Consistency changes 2016-07-05 07:15:01 +10:00
Andrew Bauer 75a98601ef fix jpeg buffer too small 2016-07-03 14:59:05 -05:00
Andy Bauer 980d3f6e7f rpm housecleaning, change the way jscalendar is installed 2016-07-03 11:34:35 -05:00
Steve Gilvarry b2d1d688cc Updates to Ubuntu and Debian install guides 2016-07-03 20:21:13 +10:00
Steve Gilvarry 3eccdcd3e2 Merge pull request #1524 from ZoneMinder/add_api_auth 
if user=&pass= are in request, use them for auth in api
 2016-06-29 21:47:44 +10:00
Steve Gilvarry f3779d543c Merge pull request #1521 from ZoneMinder/fix_zone_edit 
update area when points move
 2016-06-29 21:46:28 +10:00
Steve Gilvarry bdd0790106 Merge pull request #1522 from ZoneMinder/video_session 
Move the session start down to where it is actually needed so that we…
 2016-06-29 21:45:12 +10:00
Andrew Bauer f3583e5707 rpm specfile - add support for f24, remove support for f22 2016-06-24 15:39:57 -05:00
Andrew Bauer 97baf4ecd3 Merge pull request #1529 from ZoneMinder/fix_1526 
connect needs a +1
 2016-06-24 09:53:46 -05:00
Isaac Connor 7496dc392f get rid of use of separator, just use \n 2016-06-21 14:06:07 -04:00
Isaac Connor dfc885a12a fix tabs 2016-06-21 12:25:13 -04:00
Isaac Connor b4aec41d3d fix warnings and move User import up higher to where it needs to be 2016-06-21 09:09:58 -04:00
Steve Gilvarry 2304806bcc Merge pull request #1544 from SteveGilvarry/feature-h264-videostorage 
Feature-h264-videostorage - Fix missing } from merge that was preventing building.
 2016-06-19 08:04:10 +10:00
Steve Gilvarry d8f6cc952d Fix missing } from merge that was preventing building. 2016-06-19 07:22:14 +10:00
Andrew Bauer c0b357ec59 Merge pull request #1539 from knnniggett/onvifProbeType 
zmonvif-probe - fixes syntax error reported on some (older) Perls
 2016-06-18 11:59:05 -05:00
Andrew Bauer 9dd5e34dc8 Merge pull request #1541 from altaroca/zmonvif-probe-1397 
zmonvif-probe: Set $transport->message to prevent undef error
 2016-06-18 09:10:25 -05:00
Jan M. Hochstein 2157f22669 Set ->message to prevent undef error 2016-06-18 15:46:05 +02:00
Andrew Bauer 0fd42abd87 fixes syntax error reported on some (older) Perls 2016-06-17 14:12:14 -05:00
Isaac Connor 08c8da3e8f fix extra else and some whitespace 2016-06-17 11:37:20 -04:00
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor 0c82e82ae2 Don't update x in updateY and don't update y in updateX as they are not defined. 2016-06-16 12:00:00 -04:00
Steve Gilvarry d0e08b32f5 Merge pull request #1506 from Disassembler0/master 
Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8
 2016-06-17 00:01:08 +10:00
Isaac Connor baa7da086a Merge pull request #1520 from knnniggett/zmlocalcamera 
Set VIDEO_MAX_FRAME if it is not defined
 2016-06-16 09:31:24 -04:00
Steve Gilvarry f393f3a6f0 Merge pull request #1528 from ZoneMinder/deprecate_configadmin 
Removes current issue in master so it wins.
Disclaimer: This action in no way indicates alliance with Team Isaac over Team Andy 👬
 2016-06-16 07:43:14 +10:00
Isaac Connor 99c13628fe Merge pull request #1531 from SteveGilvarry/FixLogExport 
Adjust download file path to swap path to match the file generated.
 2016-06-14 07:11:49 -04:00
Steve Gilvarry f804f7739d Adjust download file path to swap path to match the file generated. 2016-06-14 20:49:38 +10:00
Isaac Connor 83ac4cd061 change the input handler from onchange to oninput. Disable form submit when hitting enter 2016-06-13 09:40:04 -04:00
Isaac Connor 632ec38d7d Put back in neccessary callt o updateArea 2016-06-12 16:10:24 -04:00
Isaac Connor 472973e975 connect needs a +1 2016-06-12 15:45:24 -04:00