Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage

2016-06-17 11:09:47 -04:00

..

js

Merge branch 'master' into feature-h264-videostorage

2016-06-17 11:09:47 -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

make zones unclickable when zm is not running

2016-05-26 09:35:36 -05: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

Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage

2016-04-30 22:27:10 +10:00

eventdetail.php

add translate function

2015-05-10 08:10:30 -05:00

events.php

remove the if(pages>1) so that the if > line always happens

2016-04-15 16:11:53 -04:00

export.php

add translate function

2015-05-10 08:10:30 -05:00

filter.php

Add ServerId and ServerName to fields that we can filter on

2015-12-21 10:03:48 -05:00

filtersave.php

add translate function

2015-05-10 08:10:30 -05:00

frame.php

Merge branch 'master' into feature-h264-videostorage

2016-06-17 11:09:47 -04: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

disable save button when nothing slected. fixes #1322

2016-03-09 09:43:44 -06: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

Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist

2016-01-01 17:10:37 -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 branch 'master' into feature-h264-videostorage

2016-06-17 11:09:47 -04: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

upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to

2015-12-02 12:10:26 -05:00

montagereview.php

Fix omitted reference to gif file

2015-08-09 13:12:45 -04:00

none.php

Ran script to replace all Short open tags

2014-12-05 10:44:23 +11:00

nph-zms

unlink only if file exists

2016-05-24 12:13:17 -05:00

onvifprobe.php

do not set maxfps fields during onvif probe

2016-03-26 08:38:28 -05:00

optionhelp.php

add translate function

2015-05-10 08:10:30 -05:00

options.php

Remove Phone BW settings used with mobile skin

2016-02-26 22:43:37 +11: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

User Name instead of ServerName and Hostname instead of ServerHostname

2016-01-08 10:15:21 -05: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

use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event

2015-11-18 21:21:56 -08: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

put () after property names of Monitor object

2015-12-01 14:30:24 -05:00

zone.php

split out versus get functionality in includes/functions. Fix positioning of svg over image stream

2016-05-24 15:50:22 -04:00

zones.php

Merge branch 'master' into fix_zone_edit

2016-05-24 15:30:56 -04:00