8351 Commits

Author	SHA1	Message	Date
Isaac Connor	1eaeccc564	Handle zones not being set in options	2022-04-19 12:31:43 -04:00
Isaac Connor	df61f50724	Make monitor video centered	2022-04-10 18:55:37 -04:00
Isaac Connor	0cc2a78aec	add some relative positioning so that everything works. Move svg styling into .css	2022-04-10 18:55:16 -04:00
Isaac Connor	7b5ee86ee8	Move svg zone display into Monitor->getStreamHTML. Remove most of it because scaling is now automatic. Move styling to css	2022-04-10 18:54:01 -04:00
Isaac Connor	a1f0ac2e48	width=auto,height=auto,scale=fixed operates the same as scale=auto. Don't set height. Height is ONLY set when a specific height is chosen. Which may go away for an aspect ratio dropdown instead.	2022-04-10 17:30:34 -04:00
Isaac Connor	e8391ad0be	Move collapsed status to Monitor.php and put back setting width and height on the monitorStream container.	2022-04-10 17:28:38 -04:00
Isaac Connor	b339dc2686	img scaling has been moved to MonitorStream.js	2022-04-10 17:27:12 -04:00
Isaac Connor	2c0a9528b3	Fix behaviour of layout,width,height scale etc. Height is a special case, it works differently than the rest. Use MonitorStream.js functions for setting the width/height and scale of the zms url. The img is always 100% width and height, everything is set in the containing divs.	2022-04-10 17:26:23 -04:00
Isaac Connor	37d0b6e606	Add some basic sanity checks for width & height == 0	2022-04-07 19:38:43 -04:00
Isaac Connor	a58111fa46	Rough in an onclick handler for the monitor tabs so that we can store the selected tab value	2022-04-07 13:17:02 -04:00
Isaac Connor	0fc6ffe359	Use non-minified chosen.js because we made changes.	2022-04-07 13:15:15 -04:00
Isaac Connor	229f159069	If the select is hidden, it will have 0 width. So instead return 100%	2022-04-07 13:14:58 -04:00
Isaac Connor	e9f248def7	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2022-04-06 14:58:52 -04:00
Isaac Connor	10383d775a	Fix on-change-this to data-on-change-this and remove an extra /tr	2022-04-06 14:58:42 -04:00
Isaac Connor	906951e450	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2022-04-06 10:37:10 -04:00
Isaac Connor	0e337cd8bf	Remove support for Cambozola which no longer works or is needed.	2022-04-06 10:37:02 -04:00
Isaac Connor	6d17aa4b77	Don't always default to Freeform. Also update some code in selectLayout	2022-04-04 17:47:45 -04:00
Isaac Connor	4fd027fbcc	Fix test for chrome version 7 by not including periods. We only care about the major and php is confused.	2022-04-04 17:03:36 -04:00
Isaac Connor	ed7c139fb3	Add backtrace to ajaxError	2022-04-04 15:00:33 -04:00
Isaac Connor	717dfff0c4	Merge pull request #3456 from exuvo/master ... ffmpeg change	2022-04-03 14:59:35 -04:00
Isaac Connor	19d823497e	Add id's to nav row divs to facilitate styling. Only output third row if it has contents	2022-03-30 13:16:49 -04:00
Isaac Connor	d0ee8dc6fd	remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control.	2022-03-29 17:19:31 -04:00
Isaac Connor	474b6f1a2f	Allow editing of admin user. Hide snapshots permission if the feature is turned off	2022-03-29 17:19:31 -04:00
Isaac Connor	40014588d4	Put the monitor Id first instead of stuck on the end of the Name	2022-03-29 17:16:25 -04:00
Isaac Connor	5618d242f9	Change from DecodingEnabled to Decoding, and move to Source tab	2022-03-28 17:57:16 -04:00
Isaac Connor	abf238a469	update help for Decoding options	2022-03-28 17:56:42 -04:00
Isaac Connor	723c10ca19	Cleanup options, add DecodingOptions	2022-03-28 17:45:01 -04:00
Isaac Connor	0e4c175aba	clean up debug	2022-03-28 13:49:46 -04:00
Isaac Connor	d6e504aa34	trim all monitor inputs before looking for errors. No inputs should have whitespace at beginning or end	2022-03-28 13:47:45 -04:00
Isaac Connor	2b8fee80de	escape html in Storage names	2022-03-21 16:06:52 -04:00
Isaac Connor	531793276f	Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session.	2022-03-21 15:31:44 -04:00
Isaac Connor	08598ace6b	remove space	2022-03-20 19:13:46 -04:00
Isaac Connor	23aa41091f	Add Trigger/etc to onMotion recording option	2022-03-20 19:13:46 -04:00
Isaac Connor	b67185fe9c	Fix alignment on Capture Method	2022-03-20 19:13:46 -04:00
Isaac Connor	13f403c56e	fix eslint	2022-03-13 08:47:11 -04:00
Isaac Connor	9aeeb58014	Fix missed Function => Capturing == None	2022-03-13 08:37:33 -04:00
Isaac Connor	c6a1a4ff0e	Fix potential XSS from Username	2022-03-13 08:34:44 -04:00
Isaac Connor	48d3526459	Fix potential XSS from Username	2022-03-13 08:19:12 -04:00
Exuvo	7924fa6326	Add webm as allowed output format	2022-03-11 21:46:09 +01:00
Exuvo	9fd0a94c9f	Add support for vp9 and av1 encoding	2022-03-11 13:37:27 +01:00
Isaac Connor	550693af10	Add a pattern to prevent invalid username characters	2022-03-10 14:10:31 -05:00
Isaac Connor	07aa171c04	Output valid html only for Username to prevent XSS	2022-03-10 14:10:04 -05:00
Isaac Connor	f49601a173	Add filtering to Username to prevent XSS	2022-03-10 14:09:41 -05:00
Isaac Connor	c395d46cc8	Split options into Capturing, Analysing, Recording tabs	2022-03-10 13:54:38 -05:00
Javier Gonzalez	cc3b5421f5	Adding recording status to console	2022-03-09 19:59:21 +01:00
Isaac Connor	10402fdabe	Use template backticks for the Notes string to handle multi-line	2022-03-04 13:41:19 -05:00
Isaac Connor	8db08f5a10	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2022-03-04 12:09:44 -05:00
Isaac Connor	1fb42d0b77	Change api of selectLayout. Now takes a value. use MonitorStream.setScale to set image scale. In general fix behaviour when switching between fixed sizes, scales and layouts	2022-03-04 12:08:29 -05:00
Isaac Connor	920f5470a8	Don't set width&height on img. img is always 100% of container. Don't show zoom unless it is != 1.0. Only update buttons if there is a change, to reduce redraws	2022-03-04 12:07:32 -05:00
Isaac Connor	0c31e35b4e	Add classes to fields of monitor status so we can style them as needed	2022-03-04 12:06:49 -05:00