zoneminder/web/skins/classic/js
SteveGilvarry 20c295ad0c Merge remote-tracking branch 'upstream/master' into feature-plugins
Conflicts:
	.travis.yml
	CMakeLists.txt
	Makefile.am
	bootstrap.sh
	configure.ac
	distros/debian8/control
	distros/debian_cmake/control
	misc/Makefile.am
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zmstreamer.cpp
	web/lang/ru_ru.php
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-04-07 00:00:38 +10:00
..
classic.js Increase height of plugin window 2015-05-16 07:36:08 +02:00
dark.js increase height of logout popup to fit content 2016-01-08 12:14:01 -05:00
flat.js Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10: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 move the window size definitions into a separate file for each css version flat or classic 2015-05-01 16:02:55 -04:00
skin.js.php propagate canEditGroup permission 2015-08-15 13:22:13 -05:00