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 |
|
Isaac Connor
|
11981efad2
|
add this back
|
2016-04-08 13:20:26 -04:00 |
|
Isaac Connor
|
6bb95beb9a
|
Merge branch 'svg_zones' into storageareas
|
2016-04-08 13:20:01 -04:00 |
|
Isaac Connor
|
34bfbb4708
|
blah
|
2016-04-08 13:18:13 -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
|
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 |