ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/web/skins/classic/views/js
History
SteveGilvarry b79c2c1604 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch 
Conflicts:
	web/skins/classic/views/event.php
	web/skins/classic/views/timeline.php

Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
 		2014-12-25 08:24:48 +10:00
..
Makefile.am Fixed autotools build to reflect file name change 2014-12-15 18:11:06 -05:00
console.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
console.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
control.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
controlpreset.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
controlpreset.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
cycle.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
cycle.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
devices.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
donate.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
donate.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
event.js Merge branch 'video' into feature-h264-videostorage 2014-12-02 20:58:35 +11:00
event.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
events.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
events.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
export.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
export.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
filter.js Fixes errors when opening Filters (issue #34) 2014-07-04 11:00:00 -05:00
filter.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
group.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
groups.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
log.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
login.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
monitor.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
monitor.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
monitorpreset.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
monitorprobe.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
montage.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
montage.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
options.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
plugin.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
plugin.js.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
postlogin.js.php Offer login instead of error 2014-12-15 17:17:03 -05:00
state.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
state.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
timeline.js Missed mkv in timeline.js 2014-12-01 21:55:43 +11:00
timeline.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
user.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
version.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
version.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
video.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
video.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
watch.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
watch.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
zone.js Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
zone.js.php Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00