2023 Commits

Author	SHA1	Message	Date
Steve Gilvarry	3eccdcd3e2	Merge pull request #1524 from ZoneMinder/add_api_auth ... if user=&pass= are in request, use them for auth in api	2016-06-29 21:47:44 +10:00
Steve Gilvarry	f3779d543c	Merge pull request #1521 from ZoneMinder/fix_zone_edit ... update area when points move	2016-06-29 21:46:28 +10:00
Steve Gilvarry	bdd0790106	Merge pull request #1522 from ZoneMinder/video_session ... Move the session start down to where it is actually needed so that we…	2016-06-29 21:45:12 +10:00
Isaac Connor	b4aec41d3d	fix warnings and move User import up higher to where it needs to be	2016-06-21 09:09:58 -04: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
Steve Gilvarry	d0e08b32f5	Merge pull request #1506 from Disassembler0/master ... Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8	2016-06-17 00:01:08 +10:00
Steve Gilvarry	f804f7739d	Adjust download file path to swap path to match the file generated.	2016-06-14 20:49:38 +10: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	dbdd1ae51e	remove debug logging	2016-06-07 16:26:58 -04:00
Isaac Connor	f26c9168c4	if user=&pass= are in request, use them for auth	2016-06-07 16:25:35 -04:00
Isaac Connor	593fe2b0c5	update area when points move	2016-06-07 11:40:53 -04:00
Isaac Connor	1930b18100	Move the session start down to where it is actually needed so that we don't hold it open while generating videos	2016-06-07 10:38:37 -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
Disassembler	883b323528	Change encoding of web/lang/cs_cz.php from ISO-8859-2 to UTF-8	2016-05-29 22:16:00 +02: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	ceaacf91bf	Merge pull request #1470 from connortechnology/api_improvements ... Api improvements	2016-05-25 12:45:03 -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
Andrew Bauer	bec14bf111	Merge pull request #1478 from ZoneMinder/fix_montage_server_refs ... pass in the server url into the monitor object to use instead of the …	2016-05-23 20:14:35 -05:00
arjunrc	4018cab743	don't pass partial data to daemoncontrol	2016-05-19 14:53:16 -04:00
Isaac Connor	20c4d07a00	Merge branch 'master' into hide_rtspdescribe	2016-05-16 14:40:04 -04:00
Isaac Connor	0faa28d058	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2016-05-16 14:38:49 -04:00
Isaac Connor	6084e2d00f	improve error message. The unrecognized action error happens above, so this error should just mention permissions	2016-05-16 14:38:40 -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	235095ed5f	fix URL to image view	2016-05-16 10:32:43 -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	ed3e975e5a	take fid and eid as alternate parameters	2016-05-12 11:55:48 -04:00
Isaac Connor	1530096560	whitespace/google code style	2016-05-12 10:17:41 -04:00
arjunrc	b513bcef82	icon's gonna kill me	2016-05-10 20:09:41 -04:00
arjunrc	af3cae578e	fixed verbose handling bug for status command on zmu	2016-05-10 20:07:28 -04:00
arjunrc	8d5f2a8e5d	added iconnor's change back	2016-05-10 19:17:09 -04:00
arjunrc	df830a5190	resolved merge conflicts	2016-05-10 19:15:00 -04:00
arjunrc	2888142e68	added status command to retrieve alarmed status of monitor in addition to on/of	2016-05-10 16:55:43 -04:00
Steve Gilvarry	c0d3d69bec	Merge pull request #1420 from connortechnology/fix_event_menubars ... remove set height on the menu bars, fixing flow issues	2016-05-10 16:55:06 +10:00
Steve Gilvarry	b03d2660cb	Merge pull request #1455 from ZoneMinder/api_servers ... rough in Server object support	2016-05-10 08:00:58 +10:00
Steve Gilvarry	cffcbc6357	Merge pull request #1462 from ZoneMinder/merge_storageareas ... Merge object model classes from storageareas	2016-05-10 07:59:25 +10:00
Isaac Connor	41776547cb	Merge branch 'master' into fix_zone_edit	2016-05-09 12:33:05 -04:00
Joshua Ruehlig	e12160456b	Support user defined MySQL Port/Socket in API	2016-05-09 00:24:08 -07:00
Isaac Connor	966a9dcd8d	Merge pull request #1467 from ZoneMinder/api_fixes ... Don't pass request data as a monitor array to daemonControl	2016-05-07 18:25:35 -04:00
Isaac Connor	e35b0a1eb2	Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames ... added alarmed frames filter	2016-05-07 17:06:37 -04:00