Commit Graph

6423 Commits

Author SHA1 Message Date
Isaac Connor fed575bdb4 add some missing () on class method calls. Remove some no longer needed global 's and some empty lines 2016-04-25 08:56:21 -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
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
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
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
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 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
Jan M. Hochstein edf3f3c43a Fixed WS-Discovery Probe message header 2016-04-10 15:57:53 +02:00
Andy Bauer fbb2a527e6 remove setButtonState. it is not needed. 2016-04-10 07:55:45 -05:00
Jan M. Hochstein 2125faa444 Added header elements to perl WS-Discovery proxy 2016-04-10 09:37:21 +02:00
Jan M. Hochstein 1558353672 Force UTF-8 when sending WS-Discovery Probe 2016-04-10 09:37:21 +02:00
Andy Bauer 988d611d03 remove unused code 2016-04-09 21:37:00 -05:00
Andy Bauer e7d35d16bc add monitor alarm state and fps to zone edit view 2016-04-09 21:34:30 -05:00
Andrew Bauer 124d781699 Merge pull request #1410 from jburgess777/zmonvif-probetypes
ONVIF: Fix probe type header and add To header
2016-04-09 12:44:25 -05:00
Andrew Bauer d2a9e320b3 Merge pull request #1409 from ZoneMinder/fix_php7_issues
Fix php7 issues
2016-04-09 12:38:56 -05:00
Jon Burgess c1526b8fe5 ONVIF: Fix probe type header and add To header 2016-04-09 17:02:36 +01:00
Isaac Connor fa56c17bdb Merge pull request #1408 from altaroca/onvif-discovery-1346
ONVIF: Added XML header in serializer
2016-04-09 11:28:59 -04:00
Isaac Connor c0c543e029 change quotes to prevent php7 complaint 2016-04-09 11:25:56 -04:00
Isaac Connor 0c8e0ac220 change quotes to prevent php7 complaint 2016-04-09 11:24:59 -04:00
Isaac Connor feb7b36f11 use a local variable to prevent modifying the arguments 2016-04-09 11:23:52 -04:00
Isaac Connor ce6f8da098 Use PDO::error_string instead of mysql_error 2016-04-09 11:23:35 -04:00
Jan M. Hochstein a6500bc61e Added XML header in serializer 2016-04-09 16:53:41 +02:00
Isaac Connor e90024c0d0 Better Error logging on disk_total_space failure 2016-04-09 09:27:12 -04:00
Andy Bauer dafdf1a289 rpm specfile changes 2016-04-08 19:22:27 -05:00
Isaac Connor 6d27a857aa put a zones class on the svg 2016-04-08 14:38:50 -04:00
Isaac Connor c73e768f1f put in the onclick for the zone to open the edit page 2016-04-08 14:25:19 -04:00
Isaac Connor b10c6ee093 fix Monitor capitalisation 2016-04-08 14:23:44 -04:00
Isaac Connor 758a0341ce convert monitor to object 2016-04-08 14:09:59 -04:00
Isaac Connor bbd33cc159 add monitor class so we don't have to everywhere else 2016-04-08 13:56:49 -04:00
Isaac Connor 22f207602b add css for the svg zones 2016-04-08 13:43:00 -04:00
Isaac Connor f749ff47ea convert to monitor object 2016-04-08 13:40:32 -04:00