Commit Graph

6664 Commits

Author SHA1 Message Date
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 9114f1e357 fix merge 2016-04-07 09:22:15 -04: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
Isaac Connor 6199a54838 more work, check for local db, check for existence of mysql, sync up between debian ubuntu1204 ubuntu1504 2016-04-06 13:45:46 -04:00
Isaac Connor 699b6458d5 bring up to date with debian postinst. Will not install the db, create the user and will run zmupdate. 2016-04-06 13:08:30 -04:00
Isaac Connor cf76360ecb bring up to date with the one in debian 2016-04-06 13:03:24 -04:00
Isaac Connor fb05e1baad grant requires rights regardless of password 2016-04-06 13:01:20 -04:00
Isaac Connor e1cbaed2a3 Merge branch 'icon_video' into storageareas 2016-04-06 12:50:46 -04:00
Isaac Connor fefa2dc804 add a test and error message if the codec is not h264 2016-04-06 12:48:16 -04:00
Isaac Connor 97974bb017 Merge branch 'master' into icon_video 2016-04-06 12:33:25 -04:00
Isaac Connor e3fffddb21 Merge branch 'master' into feature-h264-videostorage 2016-04-06 12:33:03 -04:00
Isaac Connor 7645e29913 fix distro dirs, because the cmake versions have been renamed to not have cmake in them 2016-04-06 12:27:24 -04:00
Isaac Connor e8792374ef fix distro dirs, because the cmake versions have been renamed to not have cmake in them 2016-04-06 12:27:05 -04:00
Isaac Connor 3085e8b7a2 Merge branch 'master' into feature-h264-videostorage 2016-04-06 11:55:20 -04:00
Isaac Connor 709fc35167 Merge branch 'master' into icon_video 2016-04-06 11:49:40 -04:00
Isaac Connor 59a8b37df2 Merge branch 'master' into storageareas 2016-04-06 11:47:20 -04:00
Isaac Connor dc7f2ff353 fix merge problems 2016-04-06 11:44:57 -04:00
Isaac Connor d83ab4d46c Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines 2016-04-06 11:25:05 -04:00
Isaac Connor e0529c9dd7 Merge pull request #1400 from knnniggett/bump1.29.1
bump version from 1.29.0 to 1.29.1
2016-04-06 11:19:59 -04:00
Isaac Connor 765f79a87f Merge branch 'icon_video' into storageareas 2016-04-06 11:16:38 -04:00
Isaac Connor 7491aa4381 fix spelling mistake 2016-04-06 10:55:11 -04:00
Isaac Connor 45f61b503b add these back 2016-04-06 10:53:28 -04:00
Isaac Connor 2a6071561d use zm_dump_stream_format to dump information about the packet to the log 2016-04-06 10:51:58 -04:00
Isaac Connor 9dd1c8cb4a add some packet dumping functions, stolen from ffmpeg, but these will use our logging functions 2016-04-06 10:51:20 -04:00
Isaac Connor 5a0218778c put back some text 2016-04-06 10:50:33 -04:00
Isaac Connor 2f1376950a spelling fix 2016-04-06 10:50:12 -04:00
Isaac Connor 9aeba8ced8 whitespace fixes 2016-04-06 10:50:00 -04:00
Isaac Connor 0ef02287dd revert 2016-04-06 10:49:42 -04:00
Andrew Bauer ad13d889fe bump version from 1.29.0 to 1.29.1 2016-04-06 09:30:47 -05:00
Isaac Connor 222f7755fe fix whitespace 2016-04-06 10:27:41 -04:00
Andrew Bauer 92d1963b1d Merge pull request #1399 from ZoneMinder/deprecate_autotools_distro_builds
remove autotools builds, replace them with cmake versions
2016-04-06 08:36:28 -05:00
Isaac Connor 3e5a4b6481 remove autotools builds, replace them with cmake versions 2016-04-06 08:43:20 -04:00
Isaac Connor b4b622668c fix merge 2016-04-06 08:39:47 -04:00
Isaac Connor 30d2b475eb increase log level on some success debug statements 2016-04-06 08:39:33 -04:00
Isaac Connor a92764f71a check return codes and report errors when writing trailer and closing file 2016-04-06 08:39:09 -04:00
Isaac Connor dd408cc9a1 Don't skip audo stream detection by finding video stream 2016-04-06 08:38:34 -04:00
Isaac Connor 4bc200f839 fix merge 2016-04-06 08:38:10 -04:00
Isaac Connor 9d9369db6f Don't skip audio stream by finding a video stream 2016-04-06 08:37:28 -04:00
Andrew Bauer 9c5b47404d Update CMakeLists.txt 2016-04-06 06:45:21 -05:00
Isaac Connor 9a795432cf merge all the commits from the messed up iconnor_video branch 2016-04-05 17:14:46 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor bd5ca575ed Merge branch 'iconnor_video' of github.com:ZoneMinder/ZoneMinder into iconnor_video 2016-04-05 12:31:07 -04:00
Isaac Connor 04800afaf5 Some documenting comments and debug lines, mostly just trying to understand what the code does 2016-04-05 12:30:22 -04:00
Isaac Connor f73d8be765 Merge branch 'master' into feature-h264-videostorage 2016-04-05 09:43:34 -04:00