611 Commits

Author	SHA1	Message	Date
Isaac Connor	5f46b8f942	Merge pull request #1621 from connortechnology/fix_1620 ... ptzControl expects a monitor object instead of a dbrow array.	2016-09-15 10:18:26 -04:00
Isaac Connor	54db9f2e3a	ptzControl expects a monitor object instead of a dbrow array.	2016-09-12 21:36:03 -04:00
Steve Gilvarry	563f4a9d46	Merge pull request #1505 from ZoneMinder/fix_filter_actions ... Confirmed check box status is now retained after save and changing filters.	2016-09-11 14:13:51 +10:00
corax	070051d06a	Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9' ... For easy pull-requesting	2016-09-09 14:20:03 +02:00
corax	b10c79b4f7	Add translation for 'Montage Review'	2016-09-09 13:26:19 +02:00
corax	6b18184e4a	Remove confusing link to web console	2016-09-09 12:38:30 +02:00
corax	4dc6fc03b3	Add a missing translate()-call	2016-09-09 12:35:34 +02:00
Andrew Bauer	ea34f3d69a	Merge pull request #1576 from ZoneMinder/show_other_zones ... include polygons for the other zones.	2016-08-15 20:36:16 -05:00
Isaac Connor	a0bc30d3fe	fix the order of analyse/capture being passed	2016-08-12 15:40:47 -04:00
Isaac Connor	9106675842	pass capture or analyse to getImageSrc	2016-08-12 15:17:13 -04:00
Isaac Connor	bc4923b555	use instead of for the frame object and pass to getImageSrc which expects an array	2016-08-12 13:50:18 -04:00
Andrew Bauer	24d471f452	Merge pull request #1503 from ZoneMinder/id_on_console ... add option to show monitor ID on console	2016-08-06 10:59:03 -05:00
Isaac Connor	8093470a2e	make only the editing polygon have a border. Set default for Type when creating a new zone	2016-08-02 12:19:55 -04:00
Isaac Connor	b522371080	include polygons for the other zones.	2016-08-02 12:02:07 -04:00
Andy Bauer	19265b631a	custom banner text on web console	2016-07-09 13:11:30 -05:00
Isaac Connor	0c82e82ae2	Don't update x in updateY and don't update y in updateX as they are not defined.	2016-06-16 12:00:00 -04:00
Isaac Connor	83ac4cd061	change the input handler from onchange to oninput. Disable form submit when hitting enter	2016-06-13 09:40:04 -04:00
Isaac Connor	632ec38d7d	Put back in neccessary callt o updateArea	2016-06-12 16:10:24 -04:00
Isaac Connor	4f2e0edb44	remove unnecssary updateAreas ... remove unnecessary updateZoneImage	2016-06-07 21:23:30 -04:00
Isaac Connor	593fe2b0c5	update area when points move	2016-06-07 11:40:53 -04:00
Andrew Bauer	a57a3d3186	Merge pull request #1501 from ZoneMinder/fix_zone_edit ... Fix zone edit	2016-05-31 10:33:31 -05:00
Isaac Connor	9f6f5100fe	also copy Name from the request on update and only show delete button if it has a name	2016-05-29 11:32:18 -04:00
Isaac Connor	101c93d422	When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object	2016-05-27 12:45:36 -04:00
Isaac Connor	c4e5299943	sync up auto to Auto	2016-05-27 12:45:04 -04:00
Isaac Connor	65e33d6c19	synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter	2016-05-27 11:11:30 -04:00
Isaac Connor	f461bc1e80	get rid of extra )	2016-05-26 12:18:58 -04:00
Isaac Connor	f969186abb	add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console	2016-05-26 11:15:13 -04:00
Andrew Bauer	730abc9789	make zones unclickable when zm is not running	2016-05-26 09:35:36 -05:00
Andrew Bauer	1972c4116b	Merge pull request #1486 from connortechnology/update_image_view ... Update image view	2016-05-26 09:05:14 -05:00
Andrew Bauer	575f8ec265	Merge pull request #1488 from ZoneMinder/hide_rtspdescribe ... Hide rtspdescribe	2016-05-25 08:44:17 -05:00
Isaac Connor	8f1596d683	use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr	2016-05-25 09:08:28 -04:00
Isaac Connor	a8e407172a	split out versus get functionality in includes/functions. Fix positioning of svg over image stream	2016-05-24 15:50:22 -04:00
Isaac Connor	89f58daf89	Merge branch 'master' into fix_zone_edit	2016-05-24 15:30:56 -04:00
Andrew Bauer	0052bb080c	unlink only if file exists	2016-05-24 12:13:17 -05:00
Isaac Connor	00abd36af8	fix the other case of the wrong case of rtsp	2016-05-24 12:19:31 -04:00
Isaac Connor	056eed6df9	fix to show RTSP describe option when switching back to rtsp	2016-05-24 12:15:59 -04:00
Isaac Connor	bc49aa6aa6	add missing ; and remove extra )	2016-05-24 09:34:36 -04:00
Isaac Connor	5eac0559e2	Merge branch 'master' into hide_rtspdescribe	2016-05-24 09:32:41 -04:00
Isaac Connor	20c4d07a00	Merge branch 'master' into hide_rtspdescribe	2016-05-16 14:40:04 -04:00
Isaac Connor	df8964c1f9	use eid= & fid= instead of path to frame image. The use of view=image also provides more security.	2016-05-16 10:33:21 -04:00
Isaac Connor	8cb2692bbb	pass in the server url into the monitor object to use instead of the portal url	2016-05-13 11:09:12 -04:00
Isaac Connor	be5f0cd4a9	replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php	2016-04-29 10:44:46 -04:00
Isaac Connor	c4410c512a	Merge branch 'master' into fix_event_menubars	2016-04-28 09:35:58 -04:00
Steve Gilvarry	ac5fdb8956	Merge pull request #1421 from connortechnology/fix_events_pagination ... remove the if(pages>1) so that the if > line always happens	2016-04-28 21:43:54 +10:00
Andrew Bauer	fe9cb4b7ec	Merge pull request #1442 from ZoneMinder/fix_rotate ... Fix rotate	2016-04-26 09:54:01 -05:00
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
Andrew Bauer	81757a0465	Merge pull request #1418 from pliablepixels/1417-clone-monitor ... Clone feature added	2016-04-20 13:02:10 -05:00
Isaac Connor	b2d02a64f4	reload stream after error	2016-04-19 12:02:58 -04:00
Isaac Connor	50f2747bb4	remove the if(pages>1) so that the if > line always happens	2016-04-15 16:11:53 -04:00
Isaac Connor	2b05815bfa	remove set height on the menu bars, fixing flow issues	2016-04-15 15:44:35 -04:00