2064 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
Andrew Bauer	e35ef3ce83	Merge pull request #1617 from coracis/master ... Update German translation	2016-09-09 08:55:19 -05:00
Andrew Bauer	321deb5506	Merge pull request #1599 from sabbath88/master ... add some more translation	2016-09-09 08:40:05 -05:00
corax	070051d06a	Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9' ... For easy pull-requesting	2016-09-09 14:20:03 +02:00
corax	6fab2e97b1	Update German translation of Buffer	2016-09-09 13:32:20 +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
corax	430ecd8e32	Fix some too direct translations into German	2016-09-09 11:51:53 +02:00
corax	d017138550	Fix a 'false friend' in German translation	2016-09-09 11:25:12 +02:00
Pliable Pixels	1440dd9265	retab	2016-09-03 15:02:32 -04:00
Pliable Pixels	7bf0b3c423	readded forMonitor - removed by mistake	2016-09-03 14:51:24 -04:00
Pliable Pixels	9a4330eb59	#1537 Zones Controller not returning all zones	2016-09-03 14:46:47 -04:00
Kyle Johnson	d6852e10b7	Merge pull request #1609 from connortechnology/fix_1606 ... implement suggested code to stop the monitor when Function is set to …	2016-09-01 22:57:57 -06:00
Isaac Connor	55f5db55dd	implement suggested code to stop the monitor when Function is set to None	2016-09-01 11:43:20 -04:00
David Sabbath Grits	2d44531d1f	add some more translation	2016-08-25 14:24:14 +02:00
Andrew Bauer	7d48b2c6c5	Merge pull request #1577 from ZoneMinder/fix_zmaControl ... fix error in calling zmaControl	2016-08-17 08:36:51 -05: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
Andrew Bauer	31cb86046c	Merge pull request #1592 from connortechnology/fix_analysis_frame ... Fix analysis frame	2016-08-14 10:54:46 -05:00
Isaac Connor	a0bc30d3fe	fix the order of analyse/capture being passed	2016-08-12 15:40:47 -04:00
Isaac Connor	240336e3ec	silence error when Event has no StorageId set	2016-08-12 15:20:21 -04:00
Isaac Connor	9106675842	pass capture or analyse to getImageSrc	2016-08-12 15:17:13 -04:00
Isaac Connor	bcb7dd1ba4	take optional show= to specify the analyse image or the capture image	2016-08-12 15:16:05 -04:00
Isaac Connor	3dadcc8d32	add ability to pass show=capture or show=analyse to getImageSrc	2016-08-12 15:14:51 -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	9d65ef3bb2	Merge pull request #1556 from knnniggett/banner ... custom banner text on web console	2016-08-06 10:59:53 -04:00
Andrew Bauer	382896dc0d	Merge pull request #1498 from josh4trunks/mysql_port_socket ... Add support for MySQL Port / Unix Socket	2016-08-06 09:32:32 -05:00
Isaac Connor	aa78b403a1	zmaControl can take an id #, so need to move the check for local server test down.	2016-08-02 12:33:41 -04: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
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