ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
zoneminder/web/skins/classic/views/js
History
Isaac Connor cdac403fb1 Merge ../zum into develop 
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
 		2013-07-25 11:49:55 -04:00
..
Makefile.am Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
console.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
console.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
control.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
controlpreset.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
controlpreset.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
cycle.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
cycle.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
devices.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
donate.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
donate.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
event.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
event.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
events.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
events.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
export.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
export.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
filter.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
filter.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
group.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
groups.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
log.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
login.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitor.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitor.js.php Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
monitorpreset.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
monitorprobe.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
montage.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
montage.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
options.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
plugin.js Migrate svn to git 2013-03-17 00:45:21 +01:00
plugin.js.php Migrate svn to git 2013-03-17 00:45:21 +01:00
postlogin.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
state.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
state.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
timeline.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
timeline.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
user.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
version.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
version.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
video.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
video.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
watch.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
watch.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
zone.js Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
zone.js.php Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00