zoneminder/web/skins/classic/views
SteveGilvarry bf33eab17c Merge branch 'video' into feature-h264-videostorage
Conflicts:
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_event.cpp
	web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
..
js Merge branch 'video' into feature-h264-videostorage 2014-12-02 20:58:35 +11:00
Makefile.am this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS 2014-11-26 11:57:35 -05:00
bandwidth.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
blank.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
console.php don't require SystemView to view/select groups. 2014-11-13 10:38:20 -05:00
control.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
controlcap.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
controlcaps.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
controlpreset.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
cycle.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
device.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
devices.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
donate.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
error.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
event.php Merge branch 'video' into feature-h264-videostorage 2014-12-02 20:58:35 +11:00
eventdetail.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
events.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
export.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
filter.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
filtersave.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
frame.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
frames.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
function.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
group.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
groups.php don't require SystemView to view/select groups. 2014-11-13 10:38:20 -05:00
log.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
login.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
logout.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
monitor.php Merge branch 'master' into video 2014-11-28 14:23:05 -05:00
monitorpreset.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
monitorprobe.php Determine full path to arp 2014-07-05 11:11:36 -05:00
montage.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
none.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
optionhelp.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
options.php Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css. 2014-11-26 11:55:53 -05:00
plugin.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
postlogin.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
settings.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
state.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
stats.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
status.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
timeline.php Make timeline open event.mp4 instead of mkv 2014-12-01 13:33:18 +11:00
user.php fix problem editing users, a semi-colon screwed up the if statement. 2014-07-08 10:52:55 -04:00
version.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
video.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
watch.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
zone.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00
zones.php Imported missing files from master to feature-h264-videostorage 2014-05-30 01:47:52 +10:00