21f38f85ec
Merge ../ZoneMinder.master
2016-11-08 09:22:09 -05:00
29e48da3b9
fix sftp xfers in zmfilter ( #1677 )
2016-11-07 16:08:43 -05:00
976c2eee0f
Merge pull request #1672 from kylejohnson/1671-watch-view-event-delete
...
Fix event deletion from watch view. Fixes #1671
2016-11-06 18:57:43 -06:00
735d2df3c9
event is redefined before being passed to deleteEvent. Fixes #1671
2016-11-04 23:23:40 -06:00
4613e5390d
Merge ../ZoneMinder.master
2016-11-04 15:23:05 -04:00
ae0afaed0c
Merge pull request #1666 from connortechnology/fix_whitespace
...
tabs to spaces
2016-11-04 12:55:14 -06:00
8a6a8fab5b
Merge pull request #5 from ZoneMinder/master
...
merge upstream master
2016-11-04 14:35:58 -04:00
93725b3f4b
fixup spacing in ConfigData
2016-11-04 14:05:51 -04:00
ae1abe99ab
Merge pull request #1668 from zestysoft/Memory-Map-FAQ-Additional-Details
...
Add additional details to increasing mapped memory.
2016-11-04 11:24:15 -06:00
b813b51f2b
Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details"
...
This reverts commit aa74660aa4749a90f199
2016-11-04 07:15:21 -07:00
ad898d6ffe
Merge pull request #1669 from zestysoft/UserGuide-FilteredPixelsDescription-Fix
...
Fix FilteredPixels Mode description
2016-11-04 09:02:03 -04:00
1f8e497ab9
Fix FilteredPixels Mode description
...
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
2016-11-03 23:24:31 -07:00
aa74660aa4
Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details
2016-11-03 23:08:05 -07:00
749a90f199
Add additional details to increasing mapped memory.
...
Other distro’s do not use /run/shm as the memory mapped path, so added
information to cover this case.
Also filtered the output of df to focus our attention on the only mount
points that matter here.
2016-11-03 22:43:07 -07:00
60794fab1e
Change CREATE_ANALYSIS_IMAGES Help text
...
The existing help text didn’t fully explain how blobs play a part in
this functionality.
2016-11-03 15:58:16 -07:00
ebd2d050bf
Merge branch 'master' into fix_whitespace
2016-11-03 14:42:18 -04:00
bd47439056
Merge pull request #1639 from connortechnology/cookie_scale
...
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
099cca210b
fix monitorId to MonitorId
2016-11-03 14:34:17 -04:00
3d17067276
change tabs to spaces
2016-11-03 14:30:23 -04:00
68c8178648
remove some extra spaces
2016-11-03 14:21:07 -04:00
bb371612c3
tabs to spaces
2016-11-03 14:18:03 -04:00
1bdcd39a50
add quotes to handle values with spaces
2016-10-31 20:37:58 -05:00
9f84aaa537
surround variables w/quotes to process data with spaces
2016-10-31 08:46:05 -05:00
d504043a9e
Update ru_ru.php
...
Remote extra line
2016-11-01 00:32:46 +11:00
a7c1231b46
fix WatchScale -> EventScale
2016-10-26 14:53:24 -04:00
1422f9d679
Merge pull request #1657 from knnniggett/fast_delete
...
change fast_delete to off
2016-10-20 10:18:30 -04:00
191efed8e3
change fast_delete to off - fixes #1597
2016-10-19 14:10:28 -05:00
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
3994de1b91
Merge pull request #1583 from zhuykovkb/fix_wrong_doc_root
...
fixed wrong doc root
2016-10-20 05:31:21 +11:00
0409ae5582
Merge pull request #1652 from connortechnology/fix_popup
...
handle when window.open fails
2016-10-20 05:17:44 +11:00
11cc73f55d
Merge pull request #1651 from connortechnology/fix_disable_monitor
...
Fix logic when disabling a monitor
2016-10-20 05:16:22 +11:00
c78a543e8e
Merge pull request #1475 from connortechnology/htmlselect
...
introduce htmlselect as an alternative to buildselect
2016-10-20 05:05:59 +11:00
8a6105ee5b
Merge pull request #1656 from pliablepixels/169-tz
...
added TimeZone get API
2016-10-18 16:08:55 -04:00
192d0dbb45
added TimeZone get API
2016-10-18 14:07:31 -04:00
7c8b99af23
fix bracket problems
2016-10-11 12:43:13 -04:00
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
c02b840274
Fix logic when disabling a monitor
2016-10-11 12:10:47 -04:00
ded1e0ea73
handle when window.open fails
2016-10-11 11:48:29 -04:00
3801d9e43e
Disabled autocorrect, autocapitalize, spellcheck on username field for login form
2016-10-10 11:27:36 -07:00
006fcad10a
move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging
2016-10-07 11:35:14 -04:00
7b574e0d41
Merge pull request #1645 from connortechnology/fix_onvif
...
Fix onvif
2016-10-04 16:34:58 -05:00
ac24865647
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:51 -04:00
6814bcc791
add NoDetectProfiles instead of reusing NoDetectedCameras
2016-10-04 14:33:38 -04:00
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
e7eab488c9
password is not required, set it to '' to quiet warnings
2016-10-04 14:28:30 -04:00
84a18926d8
password is not required, set it to '' to quiet warnings
2016-10-04 14:28:03 -04:00
09c5e3012a
username and password don't actually have to be specified
2016-10-04 14:09:32 -04:00
df255d3d5d
check for existence of attribute before calling it to break gently
2016-10-04 14:07:11 -04:00
866b6fea8c
Fall back to getCapabilities if getServices is not supported.
2016-10-04 14:06:23 -04:00
21a94a6200
better error message
2016-10-04 10:29:37 -04:00
Isaac Connor
Andrew Bauer
Kyle Johnson
Isaac Connor
Ian
Andrew Bauer
Steve Gilvarry
Pliable Pixels
Jeff Vogt