mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-18 22:07:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,454 Commits 80 Branches 104 Tags
e0a34bce8a4e09365d0312c2a39a5fb8b35c19a7
Commit Graph

6454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Gilvarry
e0a34bce8a Merge pull request #1582 from SteveGilvarry/feature-h264-videostorage 
Merge Master to feature-h264-videostorage
 2016-08-05 23:18:42 +10:00
Steve Gilvarry
ea1ae815f1 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2016-08-05 23:03:06 +10:00
Andrew Bauer
004b651d61 RPM specfile config change 
use make macros, rather than hard coded values
 2016-07-31 15:06:39 -05:00
Andrew Bauer
3c6692d0d5 RPM specfile config change 
fix logrotate script
 2016-07-31 07:29:37 -05:00
Steve Gilvarry
acb2121618 Merge pull request #1570 from SteveGilvarry/feature-h264-videostorage 
Add libx264-dev and libmp4v2-dev to build requires to save hassle of
 2016-07-31 13:52:44 +10:00
Steve Gilvarry
3543c37f5e Add libx264-dev and libmp4v2-dev to build requires to save hassle of 
ensuring they are installed before build.
 2016-07-31 08:24:52 +10:00
Steve Gilvarry
97aa674274 Merge pull request #1559 from onlyjob/warn 
reduce noise on "zmupdate.pl" invocation
 2016-07-30 00:41:55 +10:00
Steve Gilvarry
24aeb91ef2 Merge pull request #1558 from onlyjob/spellcheck 
spellcheck/codespell
 2016-07-30 00:35:10 +10:00
Andrew Bauer
627b838fc4 Merge pull request #1565 from SteveGilvarry/avdict 
Enable local and travis ccache
 2016-07-29 09:34:11 -05:00
Steve Gilvarry
e0e49a2734 Merge pull request #1511 from TJC/feature/improve_docker 
Improve Docker features
 2016-07-30 00:30:49 +10:00
Steve Gilvarry
e7aed10f77 Merge pull request #1564 from pliablepixels/api-config-edit-example 
Added example of configs API edit
v1.30.0 		2016-07-28 11:45:26 +10:00
Steve Gilvarry
0234e82396 Enable local and travis ccache 2016-07-24 09:26:10 +10:00
Pliable Pixels
dc916bba2c case typo 2016-07-23 08:04:46 -04:00
Pliable Pixels
45a62dc8d8 Added example of configs API edit 2016-07-23 08:03:15 -04: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
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
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
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