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
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
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
Isaac Connor 0ce85137dc remove points. Don't need them here 2016-04-08 13:39:31 -04:00
Isaac Connor f20945bf84 update zone points in SVG 2016-04-08 13:13:10 -04:00
Isaac Connor 7da6e1e5a1 use stream for image, add SVG polygon 2016-04-08 12:36:09 -04:00
Isaac Connor 256df08af4 update SVG polygon points on point update 2016-04-08 12:32:26 -04:00
Isaac Connor 45d58c3ad6 convert points to circles, because squares are not centered on the point.. but a circle is 2016-04-08 11:17:16 -04:00
Isaac Connor 79552e5393 use new getStreamHTML 2016-04-08 11:11:09 -04:00
Isaac Connor 3056069f3f introduce getStreamHTML which returns the required HTML to give you a live image 2016-04-08 11:06:34 -04:00
Isaac Connor 3be3a3ada2 convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones 2016-04-08 10:46:51 -04:00
Andrew Bauer 176220f1bf Update version 
Bumping back to 1.29.0
Note to all: We need to remember to bump this at the moment we create our next release
 2016-04-08 07:44:30 -05:00
Isaac Connor e473839704 substitute ZM_DB_NAME,ZM_DB_USER and ZM_DB_PASS from zm.conf for defaults 2016-04-06 15:50:51 -04:00
Isaac Connor 3dd010b40a User and and instead of defaults 2016-04-06 15:44:56 -04:00
Isaac Connor 6cdbcfc9e6 add back identified by 2016-04-06 13:55:18 -04:00