ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/web/skins/classic/views
History
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
..
js Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
bandwidth.php add translate function 2015-05-10 08:10:30 -05:00
blank.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
console.php Merge pull request #961 from Linwood-F/960-montage-review-new-feature 2016-02-08 20:40:04 -06:00
control.php add translate function 2015-05-10 08:10:30 -05:00
controlcap.php add translate function 2015-05-10 08:10:30 -05:00
controlcaps.php add translate function 2015-05-10 08:10:30 -05:00
controlpreset.php add translate function 2015-05-10 08:10:30 -05:00
cycle.php add translate function 2015-05-10 08:10:30 -05:00
device.php add translate function 2015-05-10 08:10:30 -05:00
devices.php add translate function 2015-05-10 08:10:30 -05:00
donate.php add translate function 2015-05-10 08:10:30 -05:00
error.php add translate function 2015-05-10 08:10:30 -05:00
event.php add translate function 2015-05-10 08:10:30 -05:00
eventdetail.php add translate function 2015-05-10 08:10:30 -05:00
events.php add translate function 2015-05-10 08:10:30 -05:00
export.php add translate function 2015-05-10 08:10:30 -05:00
filter.php Add ServerId and ServerName to fields that we can filter on 2015-12-21 10:03:48 -05:00
filtersave.php add translate function 2015-05-10 08:10:30 -05:00
frame.php add translate function 2015-05-10 08:10:30 -05:00
frames.php use correct tag for the frame popup so that it gets the correct popup window size 2015-06-03 12:09:38 -04:00
function.php followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
group.php disable save button when nothing slected. fixes #1322 2016-03-09 09:43:44 -06:00
groups.php bump version to 1.28.101 2015-08-15 12:01:57 -05:00
log.php 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.php recaptcha fixes to avoid lockout 2015-09-24 15:44:35 -04:00
logout.php add translate function 2015-05-10 08:10:30 -05:00
monitor.php Merge remote-tracking branch 'upstream/master' into feature-plugins 2016-04-07 00:00:38 +10:00
monitorpreset.php add translate function 2015-05-10 08:10:30 -05:00
monitorprobe.php add translate function 2015-05-10 08:10:30 -05:00
montage.php upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to 2015-12-02 12:10:26 -05:00
montagereview.php Fix omitted reference to gif file 2015-08-09 13:12:45 -04:00
none.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
onvifprobe.php do not set maxfps fields during onvif probe 2016-03-26 08:38:28 -05:00
optionhelp.php add translate function 2015-05-10 08:10:30 -05:00
options.php Remove Phone BW settings used with mobile skin 2016-02-26 22:43:37 +11:00
plugin.php Fix plugin window title name 2015-06-06 18:35:43 +02:00
postlogin.php add translate function 2015-05-10 08:10:30 -05:00
server.php User Name instead of ServerName and Hostname instead of ServerHostname 2016-01-08 10:15:21 -05:00
settings.php add translate function 2015-05-10 08:10:30 -05:00
state.php added oninput for text field handling 2015-08-26 11:22:09 -04:00
stats.php add translate function 2015-05-10 08:10:30 -05:00
status.php add translate function 2015-05-10 08:10:30 -05:00
timeline.php followup changes based on comments in #833 2015-05-21 12:23:31 -05:00
user.php bump version to 1.28.101 2015-08-15 12:01:57 -05:00
version.php add translate function 2015-05-10 08:10:30 -05:00
video.php add translate function 2015-05-10 08:10:30 -05:00
watch.php put () after property names of Monitor object 2015-12-01 14:30:24 -05:00
zone.php Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support 2015-05-28 23:43:13 +02:00
zones.php add translate function 2015-05-10 08:10:30 -05:00