Isaac Connor a679455a0b Merge branch 'master' into merge_work_on_zms		2022-01-07 16:22:51 -05:00
..
css	remove padding from container in watch view so that image can go right to edge. Add 1px padding to sidebar for better visual separation.	2021-12-15 14:49:40 -05:00
graphics	upgrade jquery-ui to 1.12.1	2018-02-08 13:19:16 -05:00
includes	Restore inclusion of video files in export when not including images. Fixes #3324	2021-11-17 11:04:28 -05:00
js	Move state definitions into skin.js.php because they are used in several different views. Add STATE_UNKNOWN to match of with c++ side actual values.	2021-12-09 12:35:42 -05:00
views	Merge branch 'master' into merge_work_on_zms	2022-01-07 16:22:51 -05:00
skin.php	Move the Basic Auth login code from skin.php to includes/auth.php	2020-03-02 15:00:31 -05:00