Isaac Connor 59406fd03a Merge branch 'master' into storageareas

2016-04-28 09:24:36 -04:00

..

js

Merge branch 'master' into storageareas

2016-04-26 13:10:37 -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

fix clone merge

2016-04-26 15:02:34 -04: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

redo fix_rotate

2016-04-25 15:57:39 -04:00

eventdetail.php

add translate function

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

events.php

Merge branch 'master' into storageareas

2016-04-28 09:24:36 -04:00

export.php

add translate function

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

filter.php

Add Concurrent

2016-02-05 11:59:05 -05:00

filtersave.php

Add Concurrent

2016-02-05 11:59:05 -05:00

frame.php

introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame.

2016-04-25 14:59:55 -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

header.php

remove teh dropdown-ness of the montage options

2016-04-12 08:52:26 -04:00

image-ffmpeg.php

Merge branch 'iconnor_video' into storageareas

2016-04-01 11:35:38 -04: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

Restyle of Login page.

2016-03-12 20:11:32 -05:00

logout.php

add translate function

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

Makefile.am

add header.php to autotools build

2016-04-04 11:35:51 -04:00

monitor.php

Merge branch 'master' into storageareas

2016-04-26 13:10:37 -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

add a title to each monitor with the name so that the mouseover will show it

2016-01-14 10:50:42 -05:00

montagereview.php

Do some Storage Areas support

2016-03-29 11:52:25 -04:00

none.php

Ran script to replace all Short open tags

2014-12-05 10:44:23 +11: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

Merge branch 'iconnor_video' into storageareas

2016-04-05 12:32:33 -04: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

storage.php

add a storage area editing page

2015-12-15 14:08:34 -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

include Event.php

2016-02-01 14:59:06 -05:00

watch.php

whitespace changes

2016-04-17 09:29:14 -04:00

zone.php

Merge pull request #1406 from ZoneMinder/svg_zones

2016-04-11 11:14:11 -04:00

zones.php

quit the stream in zones.php when zone.php is called

2016-04-10 15:33:55 -05:00