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 |
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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
|
f73d8be765
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-05 09:43:34 -04:00 |
|
Isaac Connor
|
0f1a530891
|
ciontrol files need spaces on multi-line lines
|
2016-04-05 09:03:37 -04:00 |