2244 Commits

Author	SHA1	Message	Date
Isaac Connor	7575afc8d5	Merge branch 'master' into zma_to_thread	2020-07-21 17:38:32 -04:00
Isaac Connor	4ff341a0f5	Merge branch 'master' into zma_to_thread	2020-05-02 18:03:42 -04:00
Isaac Connor	e770be2e13	Merge branch 'release-1.34'	2020-04-23 10:26:16 -04:00
Isaac Connor	10d89ed82e	Spacing, quotes, improve debug messages.	2020-04-23 10:00:11 -04:00
Isaac Connor	571ff260cc	Merge branch 'release-1.34'	2020-04-04 16:35:09 -04:00
Isaac Connor	38555b0dd4	strip leading and trailing " in trigger message. Accept a space instead of a + in enable/disable commands to match on/off	2020-04-04 11:08:19 -04:00
Isaac Connor	3117f29f71	code style and correct license. Author was contacted and ok'd the change. Fies #2883	2020-03-30 10:32:26 -04:00
Isaac Connor	98598f1441	Add a warning when an email exceeds 10Mb	2020-03-28 11:59:19 -04:00
Isaac Connor	bfa08c3422	MOstly spaces and quotes, remove duplicated db version update and only prepare the sth once.	2020-03-27 13:06:10 -04:00
Pliable Pixels	cf6b24b432	add ES status to telemetry and --show option to display what is being sent to ZM	2020-03-26 12:11:00 -04:00
Pliable Pixels	090cd845b0	add ES status to telemetry and --show option to display what is being sent to ZM	2020-03-16 14:49:27 -04:00
Isaac Connor	0323925406	Code style updates. Quote the word Function in SQL for newer mysql	2020-03-04 09:48:55 -05:00
Isaac Connor	7c066822f3	escape table columns for mysql8	2020-03-03 17:29:31 -05:00
Isaac Connor	4dee3532c3	handle additional atributes on the html tag in html detection	2020-02-26 09:42:17 -05:00
Isaac Connor	d51fdafbc0	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-02-21 09:37:45 -05:00
Isaac Connor	869713826a	mine code cleanup	2020-02-21 09:29:35 -05:00
Isaac Connor	ade95283d9	Merge pull request #2839 from connortechnology/add_alarmed_zone_to_filters ... Add alarmed zone to filters	2020-02-19 14:52:19 -05:00
Isaac Connor	be75be9bc4	Merge pull request #2815 from connortechnology/improve_filter_emails ... Improve filter emails	2020-02-19 14:50:48 -05:00
Isaac Connor	300402013c	Merge branch 'master' into improve_filter_emails	2020-02-19 14:44:37 -05:00
Isaac Connor	ec4d565f07	set the net interface used in TransportUDP when specified	2020-02-19 14:28:53 -05:00
Isaac Connor	b8d0192bcd	Add optional net_interface after soap version to discover command	2020-02-19 14:28:23 -05:00
Isaac Connor	dab5c520fe	Merge branch 'master' into add_alarmed_zone_to_filters	2020-02-19 14:20:08 -05:00
Isaac Connor	a599028de4	If Filter attr is AlarmedZoneId we can only support the EXISTS operator	2020-02-19 14:18:28 -05:00
Isaac Connor	258ae23fb9	out an error if name contains invalid characters	2020-02-19 09:42:54 -05:00
zlodag	0c97bff645	monitor presets and controls for D-Link DCS-5020L	2020-02-19 22:50:09 +13:00
zlodag	1168db9df0	Fixed regexp in zmcamtool to accept names for currently existing MonitorPresets	2020-02-19 22:47:40 +13:00
Isaac Connor	cac7ddd89d	Discover that authority also contains port. Remove redundant stuff.	2020-02-18 16:48:08 -05:00
Isaac Connor	9a21ebf696	Remove unneeded test for :80	2020-02-18 15:10:44 -05:00
Isaac Connor	568c42cfa9	Use URI to better handle ControlAddress parsing.	2020-02-18 13:05:45 -05:00
Isaac Connor	223b618f74	quotes	2020-02-18 11:08:05 -05:00
Isaac Connor	fc8f94c315	Merge branch 'master' into improve_filter_emails	2020-02-17 16:42:44 -05:00
Isaac Connor	179da58bc8	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-02-17 16:32:52 -05:00
Isaac Connor	c337fb921d	Don't die if no MetaDataConfigurations	2020-02-17 16:32:37 -05:00
zlodag	2c51b1436c	cleaned input for "zmcamtool.pl --export <control_or_preset_name>" to fix error when running in taint mode	2020-02-16 11:41:06 +13:00
Isaac Connor	9c65a8b293	handle Amcrest cameras giving a 401 Unauthorized on the first attempt to send a command. Just send another.	2020-02-12 12:34:43 -05:00
Isaac Connor	eb5ef5203a	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-02-11 17:40:46 -05:00
Isaac Connor	cc9add9310	fall back to ControlAddress if first ptz get fails	2020-02-11 17:40:33 -05:00
Isaac Connor	050d02f1fa	Merge pull request #2832 from connortechnology/fix_2831 ... Fix 2831	2020-02-11 17:09:07 -05:00
Isaac Connor	4758b2304a	Do not alter the start time of an event	2020-02-11 15:02:12 -05:00
Isaac Connor	ac8c7a9347	default ZM_TIMEZONE value to empty in which case we don't set the value	2020-02-11 13:21:02 -05:00
Isaac Connor	3b30d0a8db	code restructure, return all valid profiles instead of just the first one. Also add multicase stream types. This incorporates ideas from patch from remi-crypto. Fixes #2825	2020-02-09 13:51:36 -05:00
Isaac Connor	edf5066d84	Use Filter fields instead of config entries for Email content, subject, To. Also change the meaning of EPI1 and EPIM. Before they replaced with the url to the frame view. Now they are the url to the image view so that we can use them to embed images directly in the email. The old behaviour has been moved to EPF1 and EPFM. A similar change was made to EIMOD.	2020-01-22 13:58:44 -05:00
Isaac Connor	8f2aeca0d7	Hide EMAIL_TO, EMAIL_BODY, EMAIL_SUBJECT config entries as they are in the Filter object now	2020-01-22 13:55:49 -05:00
Isaac Connor	a9ed5c1158	escape column names for mysql8. Fixes #2814	2020-01-21 16:53:43 -05:00
Isaac Connor	f6d10e84f2	Fix basic auth. TUrn ControlAddress into a URI if it isn't one	2020-01-12 18:07:20 -05:00
Isaac Connor	9b2a5b2261	Add table column definitions so we can use perl code to actually create or update monitors	2020-01-10 19:06:34 -05:00
Isaac Connor	80c95d5afe	Merge branch 'master' into wip_axisv2	2020-01-10 17:20:32 -05:00
Isaac Connor	f8e54ba6e3	spacing, quotes	2020-01-10 16:41:22 -05:00
Isaac Connor	971d62f60d	encode the telemetry to utf-8 before sending. Fixes #2800	2020-01-07 12:09:34 -05:00
Isaac Connor	1d24e022bb	Add realm detection	2020-01-02 16:45:27 -05:00