Isaac Connor
|
85798932ee
|
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
|
2016-04-25 14:10:26 -04:00 |
|
Isaac Connor
|
b2d02a64f4
|
reload stream after error
|
2016-04-19 12:02:58 -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 |
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
|
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 |
|
Isaac Connor
|
e90024c0d0
|
Better Error logging on disk_total_space failure
|
2016-04-09 09:27:12 -04: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
|
a0e6c004a2
|
Merge pull request #1388 from ZoneMinder/reload_stream_on_error
try to reload the image stream on error.
|
2016-04-04 20:57:48 -05:00 |
|
Andy Bauer
|
4e9a925933
|
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
|
2016-04-04 20:52:49 -05:00 |
|
Andy Bauer
|
7ff8d36598
|
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
|
2016-04-04 20:44:53 -05:00 |
|
Andrew Bauer
|
ab6758de45
|
Merge pull request #1387 from ZoneMinder/reload_stream_on_scale
reload stream on scale change
|
2016-04-04 20:32:53 -05:00 |
|
Isaac Connor
|
711343a5cc
|
fix ZM_SERVER_ID instead of ZM_SERVER
|
2016-04-04 16:34:21 -04:00 |
|
Isaac Connor
|
123a1a898a
|
try to reload the image stream on error.
|
2016-04-04 15:04:09 -04:00 |
|
Isaac Connor
|
0b13f9d76f
|
reload stream on scale change
|
2016-04-04 14:58:07 -04:00 |
|
Isaac Connor
|
02eb36040a
|
fix bad code
|
2016-04-04 12:01:37 -04:00 |
Laercio Motta
|
ad912a6c6b
|
Improve test multiserver restart camera. (FIX)
Check if the server is correctly before restart cam and multiserver is activate.
|
2016-03-31 09:45:13 -03:00 |
|
Laercio Motta
|
2f27818e5b
|
Improve test multiserver restart cam.
Test if correct server from camera edit settings.
|
2016-03-31 09:23:01 -03:00 |
|
Isaac Connor
|
247cb3d0b2
|
Merge pull request #1360 from schrorg/monitornames-spaces
Allow spaces in monitor names
|
2016-03-30 09:17:57 -04:00 |
Robin Daermann
|
c8c0586c66
|
Trim monitor names
|
2016-03-29 11:40:14 +02:00 |
|
Andrew Bauer
|
ab05d52a0a
|
Update en_gb.php
typo
|
2016-03-28 08:35:34 -05:00 |
|
Andy Bauer
|
6eda3eff72
|
do not set maxfps fields during onvif probe
|
2016-03-26 08:38:28 -05:00 |
|
Robin Daermann
|
af68fd20a8
|
Some Translations for Monitor names with spaces
|
2016-03-24 14:51:24 +01:00 |
|
Robin Daermann
|
71db9b84e6
|
Allow spaces in monitor names
|
2016-03-24 14:37:24 +01:00 |
Jon Burgess
|
9c98ccbb75
|
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
|
2016-03-20 16:13:53 +00:00 |
|
Jon Burgess
|
020731a89e
|
Fix typo in ffmpeg options help: s/passwd/passed/
|
2016-03-20 16:10:49 +00:00 |
arjunrc
|
8a47241e18
|
address issue #1335
|
2016-03-12 08:07:25 -05:00 |
|
Andrew Bauer
|
77f7a3642c
|
remove check for "selected" property
|
2016-03-09 10:34:06 -06:00 |
|
Andrew Bauer
|
3280aff876
|
disable save button when nothing slected. fixes #1322
|
2016-03-09 09:43:44 -06:00 |