Isaac Connor 1b70ed2076 Merge branch 'fix_generate_video_page' into release-1.34		2020-02-25 18:22:24 -05:00
..
css	Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849	2020-02-24 13:13:54 -05:00
graphics	upgrade jquery-ui to 1.12.1	2018-02-08 13:19:16 -05:00
includes	Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849	2020-02-24 13:13:54 -05:00
js	Fix zoneminder.com url getting undefined being added to it	2020-02-22 10:51:26 -05:00
views	Merge branch 'fix_generate_video_page' into release-1.34	2020-02-25 18:22:24 -05:00
skin.php	fix state actions	2019-02-05 12:35:06 -05:00