Commit Graph

6670 Commits

Author SHA1 Message Date
arjunrc 804ac1de81 Clone feature added 2016-04-14 13:53:10 -04:00
Isaac Connor c7dceafd67 fix first param to zm_dump_stream_format 2016-04-14 12:42:47 -04:00
Isaac Connor 30066f788d Merge branch 'feature-h264-videostorage' into storageareas 2016-04-14 12:35:21 -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
Isaac Connor 6ca40966a1 remove teh dropdown-ness of the montage options 2016-04-12 08:52:26 -04:00
Isaac Connor fb48c909ce Merge branch 'log_include_mId' into storageareas 2016-04-12 08:42:38 -04:00
Isaac Connor 2724b10163 Include mId in syslog logging. 2016-04-12 08:42:12 -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 61bd60184a Merge branch 'random_fixes' into storageareas 2016-04-11 11:28:24 -04:00
Isaac Connor 7c0f524e1f Merge branch 'master' into random_fixes 2016-04-11 11:24:41 -04: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 f3673fe4b1 Merge branch 'icon_video' into storageareas 2016-04-11 10:32:07 -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 56c2679afd Merge branch 'icon_video' into storageareas 2016-04-11 10:30:01 -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
Andy Bauer fbb2a527e6 remove setButtonState. it is not needed. 2016-04-10 07:55:45 -05: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
Isaac Connor 78c6e14e0c Merge branch 'master' into storageareas 2016-04-09 14:52:28 -04: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 498bceae0a remove styles for svg circles 2016-04-08 13:44:20 -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
Isaac Connor 0ce85137dc remove points. Don't need them here 2016-04-08 13:39:31 -04:00
Isaac Connor 56a91ed4b2 rename monitor object from Monitor to monitor. Remove points in zone list. 2016-04-08 13:37:29 -04:00
Isaac Connor 8735f1ac73 convert to monitor object 2016-04-08 13:37:01 -04:00