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

6445 Commits

Author SHA1 Message Date
Steve Gilvarry f3ca10aac6 Starting to convert to boost.interprocess 2016-04-28 01:30:05 +10:00
Steve Gilvarry dcf3852124 Starting to convert to boost.interprocess 2016-04-28 01:28:37 +10:00
Isaac Connor 69d5065ebf move ip down as well 2016-04-26 16:05:37 -04:00
Isaac Connor 5d88acb8a6 re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd 2016-04-26 16:03:26 -04:00
Isaac Connor 7d7249f328 use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows 2016-04-26 15:48:21 -04:00
Isaac Connor ff3e9c85d9 Merge pull request #1445 from abishai/master 
unbreak build under FreeBSD 32 bit II
 2016-04-26 15:09:22 -04:00
abi 9aff84fbbb unbreak build under FreeBSD 32 bit II 2016-04-26 21:53:50 +03:00
Isaac Connor d847d66e99 handle disk_free_space error 2016-04-26 14:40:40 -04:00
Andrew Bauer fe9cb4b7ec Merge pull request #1442 from ZoneMinder/fix_rotate 
Fix rotate
 2016-04-26 09:54:01 -05:00
Isaac Connor 2d8c484792 rotate dimensions when instantiating the Monitor object 2016-04-25 16:48:26 -04:00
Isaac Connor 8c53925fdc redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions. 2016-04-25 16:00:34 -04:00
Isaac Connor 85798932ee Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated 2016-04-25 14:10:26 -04:00
Isaac Connor 26a45d5fa9 Don't rotate dimensions when constructing the monitor because they are already rotated 2016-04-25 13:55:28 -04:00
Steve Gilvarry 4ca61b7bd8 Removed 180 lines of commented out code that has been hanging around 
in here for a long time.
 2016-04-25 22:12:49 +10:00
Steve Gilvarry 7fcd12fab9 Packetqueue tweaks, need to move this stuff up to monitor to maintain a packet buffer 2016-04-25 22:06:07 +10:00
Andrew Bauer 1072327dd1 remove extra quote 2016-04-21 08:01:13 -05:00
Andrew Bauer 41a68bdc6d Merge branch 'dreaddy-1128_ssmtp_mail_option' 2016-04-21 07:27:39 -05:00
Andrew Bauer 3a9ab7f685 Merge branch '1128_ssmtp_mail_option' of https://github.com/dreaddy/ZoneMinder into dreaddy-1128_ssmtp_mail_option 2016-04-21 07:27:19 -05:00
Isaac Connor 02a56b811b Don't be recursive when chowning /var/cache/zoneminder 2016-04-20 14:38:51 -04:00
Andrew Bauer 81757a0465 Merge pull request #1418 from pliablepixels/1417-clone-monitor 
Clone feature added
 2016-04-20 13:02:10 -05:00
Isaac Connor 67f38d07df Merge branch 'master' into better_zmvideo 2016-04-20 12:04:15 -04:00
Isaac Connor 5a3978f9e8 Merge pull request #1422 from abishai/master 
suppress warnings of killall for FreeBSD
 2016-04-19 14:40:37 -04:00
Isaac Connor b2d02a64f4 reload stream after error 2016-04-19 12:02:58 -04:00
Isaac Connor e255fcc603 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-04-17 09:30:17 -04:00
Isaac Connor d424a297c4 need php5-gd 2016-04-17 09:29:55 -04:00
Jan M. Hochstein 5d3f5e5a4a WSDiscovery: workaround for SOAP::WSDL QName limitation 2016-04-16 19:06:36 +02:00
abi 7058b0862a suppressed warnings of killall for FreeBSD 2016-04-16 16:39:58 +03:00
Steve Gilvarry 80f8dcbabf Merge pull request #1419 from connortechnology/feature-h264-videostorage 
Feature h264 videostorage
 2016-04-16 08:12:38 +12:00
Isaac Connor 50f2747bb4 remove the if(pages>1) so that the if > line always happens 2016-04-15 16:11:53 -04:00
Isaac Connor 2b05815bfa remove set height on the menu bars, fixing flow issues 2016-04-15 15:44:35 -04:00
Isaac Connor e4f116af2f more debug and comments, return checking 2016-04-15 15:32:48 -04:00
Isaac Connor b3e68ca2f7 Must init videoStore in constuctor 2016-04-15 15:10:26 -04:00
Isaac Connor ccb5ea766d add the toggle for RecordAudio so that the checkbox works to turn off Audio 2016-04-15 13:16:52 -04:00
Steve Gilvarry b343fe2b68 Merge pull request #1416 from pliablepixels/runstate-documentation 
updated documentation to include runstates
 2016-04-15 21:48:14 +12:00
arjunrc 804ac1de81 Clone feature added 2016-04-14 13:53:10 -04:00
Isaac Connor c189e60d9b add some comments, and dump filename and AVFormatContext on failure to write header 2016-04-14 12:34:52 -04:00
Pliable Pixels 859a55e1ef updated documentation to include runstates 2016-04-13 12:54:22 -04:00
Andrew Bauer 28b30ecb47 Merge pull request #1377 from ZoneMinder/random_fixes 
Random fixes
 2016-04-11 12:04:05 -05:00
Isaac Connor 851a81eff7 Merge pull request #1406 from ZoneMinder/svg_zones 
replace the static zone image with a stream, and use SVG to draw the zones
 2016-04-11 11:14:11 -04:00
Isaac Connor 6528793ae3 Merge branch 'icon_video' into feature-h264-videostorage 2016-04-11 10:57:04 -04:00
Isaac Connor 67abf91925 add a view to check auth and just send the video 2016-04-11 10:31:51 -04:00
Isaac Connor 32cd5bb88e these have been removed in master 2016-04-11 09:33:27 -04:00
Isaac Connor d493ca69a9 Merge branch 'master' into icon_video 2016-04-11 09:31:51 -04:00
Isaac Connor 026d3e3189 Merge branch 'master' into feature-h264-videostorage 2016-04-11 09:30:56 -04:00
Isaac Connor c58b807f8a Merge branch 'feature-h264-videostorage' into icon_video 2016-04-11 09:29:03 -04:00
Isaac Connor 32dac7e281 Merge pull request #1412 from knnniggett/contentdirs 
make cannot write to content dir an error, rather than fatal
 2016-04-10 21:21:33 -04:00
Andrew Bauer 5542788a45 make cannot write to content dir an error, rather than fatal 2016-04-10 18:45:38 -05:00
Andy Bauer 39a30ff51b refresh parent when cancel is clicked 2016-04-10 15:59:13 -05:00
Andy Bauer e5bf2d245c quit the stream in zones.php when zone.php is called 2016-04-10 15:33:55 -05:00
Jan M. Hochstein 8b92151a0c WS-Discovery header fixes 2016-04-10 18:19:10 +02:00