Isaac Connor 2f301cf5fe Merge branch 'master' of github.com:ZoneMinder/ZoneMinder		2019-02-12 13:18:08 -05:00
..
css	frame.php: Fix multiple XSS from 'show' and 'scale' parameters and enforce CSP.	2019-02-09 15:10:45 -08:00
graphics	upgrade jquery-ui to 1.12.1	2018-02-08 13:19:16 -05:00
includes	Merge branch 'master' of github.com:ZoneMinder/ZoneMinder	2019-02-12 13:18:08 -05:00
js	bandwidth.php: Submit to the 'bandwidth' view but render the 'none' view. Fixes #2493	2019-02-10 13:22:08 -08:00
views	show object detected file, if object detection in place (#2514)	2019-02-11 10:58:34 -05:00
skin.php	fix state actions	2019-02-05 12:35:06 -05:00