zoneminder/web/skins/classic/views/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
..
console.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
console.js.php recaptcha now displays translated message if secret is wrong 2015-09-25 11:11:25 -04:00
control.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
controlpreset.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
controlpreset.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
cycle.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
cycle.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
devices.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
donate.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
donate.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
event.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
event.js.php add translate function 2015-05-10 08:10:30 -05:00
events.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
events.js.php add translate function 2015-05-10 08:10:30 -05:00
export.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
export.js.php add translate function 2015-05-10 08:10:30 -05:00
filter.js Fixes errors when opening Filters (issue #34) 2014-07-04 11:00:00 -05:00
filter.js.php add translate function 2015-05-10 08:10:30 -05:00
group.js remove check for "selected" property 2016-03-09 10:34:06 -06:00
groups.js propagate canEditGroup permission 2015-08-15 13:22:13 -05:00
log.js Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist 2016-01-01 17:10:37 -05:00
login.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitor.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitor.js.php Allow spaces in monitor names 2016-03-24 14:37:24 +01:00
monitorpreset.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitorprobe.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
montage.js fix montage layout broken by my skin merging 2015-02-02 19:06:20 -05:00
montage.js.php upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to 2015-12-02 12:10:32 -05:00
onvifprobe.js Added basic ONVIF support views 2014-07-14 20:59:36 +02:00
options.js.php add translate function 2015-05-10 08:10:30 -05:00
plugin.js Add an error message if plugin option is not valid 2015-05-16 06:12:38 +02:00
plugin.js.php Add an error message if plugin option is not valid 2015-05-16 06:12:38 +02:00
postlogin.js.php Offer login instead of error 2014-12-15 17:17:03 -05:00
server.js add form validation for server editing. Currently just requires a name 2015-09-16 09:12:21 -04:00
state.js Cleaned up button handling 2015-08-26 11:21:29 -04:00
state.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
timeline.js I see no reason for these to be posts. They retrieve info, that's it. 2014-07-29 16:15:31 -04:00
timeline.js.php add translate function 2015-05-10 08:10:30 -05:00
user.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
version.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
version.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
video.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
video.js.php add translate function 2015-05-10 08:10:30 -05:00
watch.js Merge pull request #1388 from ZoneMinder/reload_stream_on_error 2016-04-04 20:57:48 -05:00
watch.js.php add monitorUrl to be used to target the recording server for the monitor 2015-12-01 15:17:49 -05:00
zone.js Make the capture process restart if a Privacy zone got changed 2015-08-27 09:45:12 +02:00
zone.js.php add translate function 2015-05-10 08:10:30 -05:00