Isaac Connor
|
68c8178648
|
remove some extra spaces
|
2016-11-03 14:21:07 -04:00 |
Isaac Connor
|
bb371612c3
|
tabs to spaces
|
2016-11-03 14:18:03 -04:00 |
Andy Bauer
|
1bdcd39a50
|
add quotes to handle values with spaces
|
2016-10-31 20:37:58 -05:00 |
Andrew Bauer
|
9f84aaa537
|
surround variables w/quotes to process data with spaces
|
2016-10-31 08:46:05 -05:00 |
Steve Gilvarry
|
d504043a9e
|
Update ru_ru.php
Remote extra line
|
2016-11-01 00:32:46 +11:00 |
Isaac Connor
|
a7c1231b46
|
fix WatchScale -> EventScale
|
2016-10-26 14:53:24 -04:00 |
Isaac Connor
|
1422f9d679
|
Merge pull request #1657 from knnniggett/fast_delete
change fast_delete to off
|
2016-10-20 10:18:30 -04:00 |
Andrew Bauer
|
191efed8e3
|
change fast_delete to off - fixes #1597
|
2016-10-19 14:10:28 -05:00 |
Steve Gilvarry
|
b723e08b17
|
Merge pull request #1646 from connortechnology/fix_zm_image_memleak
move jpeg context freeing to a Deinitialise function instead of ~Image
|
2016-10-20 05:33:01 +11:00 |
Steve Gilvarry
|
3994de1b91
|
Merge pull request #1583 from zhuykovkb/fix_wrong_doc_root
fixed wrong doc root
|
2016-10-20 05:31:21 +11:00 |
Steve Gilvarry
|
0409ae5582
|
Merge pull request #1652 from connortechnology/fix_popup
handle when window.open fails
|
2016-10-20 05:17:44 +11:00 |
Steve Gilvarry
|
11cc73f55d
|
Merge pull request #1651 from connortechnology/fix_disable_monitor
Fix logic when disabling a monitor
|
2016-10-20 05:16:22 +11:00 |
Steve Gilvarry
|
c78a543e8e
|
Merge pull request #1475 from connortechnology/htmlselect
introduce htmlselect as an alternative to buildselect
|
2016-10-20 05:05:59 +11:00 |
Isaac Connor
|
8a6105ee5b
|
Merge pull request #1656 from pliablepixels/169-tz
added TimeZone get API
|
2016-10-18 16:08:55 -04:00 |
Pliable Pixels
|
192d0dbb45
|
added TimeZone get API
|
2016-10-18 14:07:31 -04:00 |
Isaac Connor
|
aaf8f6c98b
|
add the missing case for ServerId in Filter processing.
|
2016-10-18 10:14:19 -04:00 |
Isaac Connor
|
b385ba7bf4
|
Merge branch 'master' into improve_filter
|
2016-10-18 09:59:45 -04:00 |
Isaac Connor
|
7c8b99af23
|
fix bracket problems
|
2016-10-11 12:43:13 -04:00 |
Isaac Connor
|
4d5ba3ffb8
|
Merge pull request #1650 from jvogt/1649-disable-auto-features-on-login-form
Disabled autocorrect, autocapitalize, spellcheck on username field
|
2016-10-11 12:38:27 -04:00 |
Isaac Connor
|
c02b840274
|
Fix logic when disabling a monitor
|
2016-10-11 12:10:47 -04:00 |
Isaac Connor
|
ded1e0ea73
|
handle when window.open fails
|
2016-10-11 11:48:29 -04:00 |
Jeff Vogt
|
3801d9e43e
|
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
|
2016-10-10 11:27:36 -07:00 |
Isaac Connor
|
006fcad10a
|
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
|
2016-10-07 11:35:14 -04:00 |
Andrew Bauer
|
7b574e0d41
|
Merge pull request #1645 from connortechnology/fix_onvif
Fix onvif
|
2016-10-04 16:34:58 -05:00 |
Isaac Connor
|
ac24865647
|
add NoDetectProfiles instead of reusing NoDetectedCameras
|
2016-10-04 14:33:51 -04:00 |
Isaac Connor
|
6814bcc791
|
add NoDetectProfiles instead of reusing NoDetectedCameras
|
2016-10-04 14:33:38 -04:00 |
Isaac Connor
|
7561dc00ea
|
be explici about which unnamed array we are access for getopts. Default username and password to ''
|
2016-10-04 14:33:13 -04:00 |
Isaac Connor
|
e7eab488c9
|
password is not required, set it to '' to quiet warnings
|
2016-10-04 14:28:30 -04:00 |
Isaac Connor
|
84a18926d8
|
password is not required, set it to '' to quiet warnings
|
2016-10-04 14:28:03 -04:00 |
Isaac Connor
|
09c5e3012a
|
username and password don't actually have to be specified
|
2016-10-04 14:09:32 -04:00 |
Isaac Connor
|
df255d3d5d
|
check for existence of attribute before calling it to break gently
|
2016-10-04 14:07:11 -04:00 |
Isaac Connor
|
866b6fea8c
|
Fall back to getCapabilities if getServices is not supported.
|
2016-10-04 14:06:23 -04:00 |
Isaac Connor
|
21a94a6200
|
better error message
|
2016-10-04 10:29:37 -04:00 |
Isaac Connor
|
c1f9c0aff5
|
also need ProbeMatchesType to inherit get_ProbeMatch
|
2016-10-04 10:16:01 -04:00 |
Isaac Connor
|
b742d316b3
|
apply use strict and fix issues
|
2016-10-04 10:15:16 -04:00 |
Isaac Connor
|
e6626cef69
|
if soap version is specified for probe, don't do both versions
|
2016-10-04 09:51:20 -04:00 |
Isaac Connor
|
de22f21813
|
for soap 1.2 only probe for NetworkVideoTransmitter
|
2016-10-04 09:36:28 -04:00 |
Andrew Bauer
|
de345090df
|
Merge pull request #1635 from pliablepixels/1634-api-utf8-fix
enabled utf8
|
2016-09-30 12:47:24 -05:00 |
Andrew Bauer
|
b064383248
|
Merge pull request #1643 from connortechnology/master
Add a TZ env setting for systemd.
|
2016-09-29 14:13:57 -05:00 |
Isaac Connor
|
603d903297
|
add an environment setting for TZ which eliminates a stat on /etc/locatime on every log line
|
2016-09-29 14:24:49 -04:00 |
Isaac Connor
|
8d6217f19d
|
Add a line to set the TZ variable in the env before spawning zoneminder. This prevents /etc/localtime from being stat'd on every logging call.
|
2016-09-29 14:06:12 -04:00 |
Isaac Connor
|
ef6b3d01e4
|
Merge pull request #4 from ZoneMinder/master
Updates
|
2016-09-29 10:26:04 -04:00 |
Isaac Connor
|
a77de33997
|
add a test for lib existence
|
2016-09-27 12:51:04 -04:00 |
Isaac Connor
|
6c3a3d3d50
|
store the scale value for watch and event views in a cookie, differentiated by monitorId.
|
2016-09-27 09:46:04 -04:00 |
Pliable Pixels
|
92d7cad5f1
|
enabled utf8
|
2016-09-21 11:53:34 -04:00 |
Isaac Connor
|
66ae5c52ae
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2016-09-16 09:36:41 -04:00 |
Isaac Connor
|
5f46b8f942
|
Merge pull request #1621 from connortechnology/fix_1620
ptzControl expects a monitor object instead of a dbrow array.
|
2016-09-15 10:18:26 -04:00 |
Isaac Connor
|
db8cada380
|
fix merge
|
2016-09-13 15:01:02 -04:00 |
Isaac Connor
|
3dfe1185ff
|
add ffmpeg as option to libav-tols
|
2016-09-13 10:11:50 -04:00 |
Isaac Connor
|
54db9f2e3a
|
ptzControl expects a monitor object instead of a dbrow array.
|
2016-09-12 21:36:03 -04:00 |