SteveGilvarry 4d7ded5ef0 Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage ...

Conflicts:
	configure.ac
	src/Makefile.am
	web/js/Makefile.am

2016-04-05 22:06:14 +10:00

..

classic.js

move the window size definitions into a separate file for each css version flat or classic

2015-05-01 16:02:55 -04:00

dark.js

increase height of logout popup to fit content

2016-01-08 12:14:01 -05:00

flat.js

increase height of logout popup to fit content

2016-01-08 12:14:01 -05:00

jquery-1.11.3.js

Upgrade bundled jQuery (Closes: #1263)

2016-02-18 00:28:30 +11:00

jquery.js

Upgrade bundled jQuery (Closes: #1263)

2016-02-18 00:28:30 +11:00

jquery.url

Upgrade bundled jQuery (Closes: #1263)

2016-02-18 00:28:30 +11:00

skin.js

use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event

2015-11-18 21:21:56 -08:00

skin.js.php

propagate canEditGroup permission

2015-08-15 13:22:13 -05:00