zoneminder/web/skins/classic/views
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
..
js Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage 2015-10-23 22:07:22 +11:00
Makefile.am include server.php in autotools build 2015-08-16 12:25:23 -04:00
bandwidth.php add translate function 2015-05-10 08:10:30 -05:00
blank.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
console.php fixed orange display for monitor mode 2015-10-01 11:35:38 -04: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 added control for video playback rate 2015-07-29 00:07:19 +10: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 translate function 2015-05-10 08:10:30 -05:00
filtersave.php add translate function 2015-05-10 08:10:30 -05:00
frame.php dynamically create jpegs from video file for viewing in browser 2015-07-29 00:24:05 +10: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 change edit permission from system to groups 2015-08-15 13:45:43 -05:00
groups.php bump version to 1.28.101 2015-08-15 12:01:57 -05:00
image-ffmpeg.php dynamically create jpegs from video file for viewing in browser 2015-07-29 00:24:05 +10:00
log.php add translate function 2015-05-10 08:10:30 -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-h264-videostorage 2015-10-23 22:07:22 +11: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 add translate function 2015-05-10 08:10:30 -05:00
none.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
onvifprobe.php add translate function 2015-05-10 08:10:30 -05:00
optionhelp.php add translate function 2015-05-10 08:10:30 -05:00
options.php add Groups to options again 2015-08-15 12:37:25 -05:00
plugin.php add translate function 2015-05-10 08:10:30 -05:00
postlogin.php add translate function 2015-05-10 08:10:30 -05:00
server.php content for server edit popup 2015-08-17 12:42:20 -04: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 fix timeline view for SaveJPEGs monitors (without enabled VideoWriter) 2015-10-01 22:41:31 -07: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 add translate function 2015-05-10 08:10:30 -05:00
zone.php add translate function 2015-05-10 08:10:30 -05:00
zones.php add translate function 2015-05-10 08:10:30 -05:00