Isaac Connor c9423aa902 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder		2018-10-01 10:40:20 -04:00
..
css	Add Privacy Statement (#2194)	2018-08-30 13:25:02 -04:00
graphics	upgrade jquery-ui to 1.12.1	2018-02-08 13:19:16 -05:00
includes	put back overlay.js for log view.	2018-09-23 10:51:46 -04:00
js	do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out.	2018-10-01 10:39:00 -04:00
views	dim x264 encode when on arm (#2227)	2018-10-01 09:17:22 -04:00
skin.php	spacing and google code style	2017-10-12 11:43:31 -07:00