Isaac Connor
|
6ca40966a1
|
remove teh dropdown-ness of the montage options
|
2016-04-12 08:52:26 -04:00 |
|
Isaac Connor
|
61bd60184a
|
Merge branch 'random_fixes' into storageareas
|
2016-04-11 11:28:24 -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 |
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
|
78c6e14e0c
|
Merge branch 'master' into storageareas
|
2016-04-09 14:52:28 -04:00 |
|
Isaac Connor
|
0c8e0ac220
|
change quotes to prevent php7 complaint
|
2016-04-09 11:24:59 -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
|
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
|
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 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -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 |
|
Isaac Connor
|
6c8e8368e1
|
rtsp should be lower case
|
2016-04-04 16:56:54 -04:00 |
|
Isaac Connor
|
564f189416
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 16:45:54 -04:00 |
|
Isaac Connor
|
6c92c0e3f7
|
Merge branch 'reload_stream_on_scale' into storageareas
|
2016-04-04 16:13:35 -04:00 |
|
Isaac Connor
|
98fce7c3c6
|
Merge branch 'reload_stream_on_error' into storageareas
|
2016-04-04 16:13:26 -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
|
5f3e7134fb
|
split power out of the Panel box so that I can style it better
|
2016-04-04 13:22:26 -04:00 |
|
Isaac Connor
|
f91ff4503a
|
rework the ptz controls to take up less vertical space, also don't set width of buttons
|
2016-04-04 13:20:04 -04:00 |
|
Isaac Connor
|
b3f0f5d0e8
|
Merge branch 'updated-console' into storageareas
|
2016-04-04 11:51:07 -04:00 |
|
Isaac Connor
|
197ae67313
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 11:47:29 -04:00 |
|
Isaac Connor
|
3e20e5f21c
|
fix ptz control box size
|
2016-04-04 11:40:01 -04:00 |
|
Isaac Connor
|
9dfe71ceb8
|
Always show events and always show ptz controls. Also clean out some commented out cruft
|
2016-04-04 11:39:12 -04:00 |
|
Isaac Connor
|
2233747fcb
|
add a missing t
|
2016-04-04 11:38:16 -04:00 |
Isaac Connor
|
43e4052dd9
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-04 11:36:03 -04:00 |
|
Isaac Connor
|
dd153d8efb
|
add header.php to autotools build
|
2016-04-04 11:35:51 -04:00 |
|
Isaac Connor
|
96aa20fb79
|
value should be lower case when checking for rtsp
|
2016-04-01 15:43:59 -04:00 |