6890 Commits

Author	SHA1	Message	Date
Isaac Connor	f416ab96c5	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-09-22 16:22:07 -04:00
Isaac Connor	70be6bc84c	Add an estimated ram use to buffer tabs	2020-09-22 16:21:59 -04:00
Andrew Bauer	5771e74a6f	eslint	2020-09-22 15:16:42 -05:00
Isaac Connor	eb736df405	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-09-22 15:51:49 -04:00
Isaac Connor	fbc15c8109	Fix FPS Report Interval label	2020-09-22 15:51:44 -04:00
Andrew Bauer	d2ba9c5234	load bs-table toolbar & autorefresh	2020-09-22 14:23:25 -05:00
Andrew Bauer	2bdbb48692	update to bootstrap-table 1.18.0 and more extensions	2020-09-22 14:09:02 -05:00
Isaac Connor	ed6d5a55a5	put an onchange on the monitorType causing a form submit so that Source and Storage tabs update. Rename action to save and put it on the submit button	2020-09-22 14:33:26 -04:00
Isaac Connor	0aa0452b7e	Use a redirect instead of just changing the view on monitor save. This fixes the reload issue	2020-09-22 14:05:37 -04:00
Isaac Connor	b1dd42dd8b	Use bootstrap nav pills to just hide/show the tab instead of doing form submits in monitor editing	2020-09-22 14:05:11 -04:00
Isaac Connor	7196eaf0d0	Minimum value for label position is 0, not 1.	2020-09-22 13:14:25 -04:00
Isaac Connor	b6541aa1ff	Move log export to a generic modal	2020-09-21 13:01:58 -04:00
Isaac Connor	cbbdfdbd43	Introduce generic getModal and manageModalBtns	2020-09-21 13:00:55 -04:00
Isaac Connor	2ff2fbecd9	Remove fieldset styling. We were conflicting with bootstrap	2020-09-21 13:00:29 -04:00
Isaac Connor	96474a7d94	Fix case on Servers. Turn off error reporting so that mkdir(ZM_DIR_EXPORTS) doesn't generate a warning. Fix server column in xml output	2020-09-21 13:00:03 -04:00
Isaac Connor	3e3af0bca5	Fix zmcontrol.pl command line to not use = to match with usage elsewhere	2020-09-21 11:24:17 -04:00
Isaac Connor	b16d4045ee	Merge branch 'master' of github.com:ZoneMinder/zoneminder	2020-09-21 11:15:41 -04:00
Isaac Connor	861ebedcae	Implement a crude view for a failed db connection with a 30 second reload interval.	2020-09-21 11:15:34 -04:00
Andrew Bauer	1d1b0e58d2	consolidate getJson fail callbacks to one function	2020-09-20 08:41:16 -05:00
Andrew Bauer	c75f5c68c1	unpopup the log view	2020-09-19 12:59:15 -05:00
Andrew Bauer	0a7848d9d2	remove uneeded state php and js files	2020-09-19 12:36:55 -05:00
Andrew Bauer	a3c0e160a2	convert state modal to ajax request	2020-09-19 12:36:04 -05:00
Isaac Connor	bf29357455	Merge branch 'release-1.34'	2020-09-19 12:01:21 -04:00
Isaac Connor	3492582b98	add missing css for settings popup	2020-09-19 12:00:32 -04:00
Andrew Bauer	7c1ec4f957	convert logout modal to ajax request	2020-09-19 10:44:05 -05:00
Andrew Bauer	03a0e849b8	remove unneeded js from console.js	2020-09-19 10:24:28 -05:00
Andrew Bauer	ec20fdf3ad	convert function modal to ajax request	2020-09-19 10:18:59 -05:00
Andrew Bauer	d2963fe28f	convert donate modal to ajax request	2020-09-19 08:55:08 -05:00
Andrew Bauer	467e75a11c	convert eventdetail function to php file	2020-09-18 11:03:20 -05:00
Andrew Bauer	2757b74957	convert servermodal function to php file	2020-09-18 10:34:33 -05:00
Andrew Bauer	a058d077bb	fix typo	2020-09-18 10:11:58 -05:00
Andrew Bauer	10119dc609	convert storage function to php file	2020-09-18 10:02:02 -05:00
Andrew Bauer	1b2f0514b9	convert delconfirm function to php file	2020-09-18 09:43:29 -05:00
Andrew Bauer	6e6b9a464b	convert enoperm function to php file	2020-09-18 09:24:23 -05:00
Andrew Bauer	416de4a068	fix git screwup	2020-09-18 08:56:17 -05:00
Andrew Bauer	bc7cadcc73	convert optionhelp function to php file	2020-09-18 08:35:21 -05:00
Isaac Connor	e491f2ee76	Add id's to dropdowns to fix zone edit behaviour. Remove CSP violations	2020-09-17 20:58:53 -04:00
Isaac Connor	8f3b3466af	setup onblur function for presetSelector	2020-09-17 20:58:18 -04:00
Isaac Connor	29880cdab3	handle width options['width'] and options['height'] aren't set	2020-09-17 20:57:14 -04:00
Isaac Connor	006cc079c4	Rework action to use Zone class and just take a list of Zid's so that technically we can delete zones from multiple monitors at once.	2020-09-17 20:56:56 -04:00
Isaac Connor	1701089211	Add MonitorId to Zone fields and add Monitor() method	2020-09-17 20:56:21 -04:00
Isaac Connor	42dc4e46b1	add canEdit method to Monitor object	2020-09-17 20:56:04 -04:00
Isaac Connor	f61a21fec4	Add modals dir with filterdebug modal	2020-09-17 15:17:53 -04:00
Isaac Connor	6aa4302fe0	Add EventDiskSpace as a term and add a Debug modal button	2020-09-17 15:17:29 -04:00
Isaac Connor	bb4bd935d6	use getBodyTopHTML as it include an error message div. Show db errors with the error message	2020-09-17 15:17:06 -04:00
Isaac Connor	6a77591237	Add lang for Event DiskSpace and FileSystem ISKSpace	2020-09-17 15:15:28 -04:00
Isaac Connor	4a6743be3f	turn off debug	2020-09-17 15:15:13 -04:00
Isaac Connor	123b2a4747	Change Event Diskspace case to not interfere with Filesystem DiskSpace	2020-09-17 15:14:54 -04:00
Isaac Connor	1caaf01502	Add code to the default case to include a file in ajax/modals/.php so that the modals template can be kept out of functions.php. We don't need the auth stuff. Also turn off error reporting as we should only return json.	2020-09-17 15:14:09 -04:00
Isaac Connor	ef8fb774df	Handle no data in setNavBar	2020-09-17 13:51:31 -04:00