zoneminder/web/skins/classic/views
Emmanuel Papin 6b2c435460 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into plugin_support_list
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
2015-05-14 11:12:38 +02:00
..
js Fix a conflict with php variable 2015-05-06 23:16:09 +02:00
Makefile.am Merge branch 'master' into plugin_support_test 2015-02-25 23:14:25 +01:00
bandwidth.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
blank.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
console.php Remove a remaining hardcoded string 2015-04-18 18:14:36 +02:00
control.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
controlcap.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
controlcaps.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
controlpreset.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
cycle.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
device.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
devices.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
donate.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
error.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
event.php Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
eventdetail.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
events.php Also fix video.pho which has the same problem. 2015-02-23 14:34:13 -05:00
export.php close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session. 2015-04-20 13:06:34 -04:00
filter.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
filtersave.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
frame.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
frames.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
function.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
group.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
groups.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
log.php Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
login.php Offer login instead of error 2014-12-15 17:17:03 -05:00
logout.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
monitor.php Merge master 2015-05-05 23:37:20 +02:00
monitorpreset.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
monitorprobe.php User configurable arp tool 2015-02-21 13:08:04 -06:00
montage.php trival quoting changes and missing semi colons 2015-02-02 19:06:45 -05:00
none.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
onvifprobe.php Found some introduced short tags 2015-04-08 20:13:27 +10:00
optionhelp.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
options.php add missing commas 2014-12-18 09:44:04 -05:00
plugin.php Fix a conflict with php variable 2015-05-06 23:16:09 +02:00
postlogin.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
settings.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
state.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
stats.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
status.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
timeline.php also fix timeline which has the same problem 2015-02-23 14:27:35 -05:00
user.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
version.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
video.php Also fix video.pho which has the same problem. 2015-02-23 14:31:15 -05:00
watch.php Remove hardcoded localized strings and update lang files 2015-04-18 17:14:14 +02:00
zone.php Fix conflict when merging upstream master 2014-12-13 19:54:54 +01:00
zones.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00