Isaac Connor
45d58c3ad6
convert points to circles, because squares are not centered on the point.. but a circle is
2016-04-08 11:17:16 -04:00
Isaac Connor
79552e5393
use new getStreamHTML
2016-04-08 11:11:09 -04:00
Isaac Connor
3be3a3ada2
convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones
2016-04-08 10:46:51 -04:00
Andrew Bauer
a0e6c004a2
Merge pull request #1388 from ZoneMinder/reload_stream_on_error
...
try to reload the image stream on error.
2016-04-04 20:57:48 -05:00
Andy Bauer
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
Andy Bauer
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
Isaac Connor
123a1a898a
try to reload the image stream on error.
2016-04-04 15:04:09 -04:00
Isaac Connor
0b13f9d76f
reload stream on scale change
2016-04-04 14:58:07 -04:00
Isaac Connor
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
Robin Daermann
c8c0586c66
Trim monitor names
2016-03-29 11:40:14 +02:00
Andy Bauer
6eda3eff72
do not set maxfps fields during onvif probe
2016-03-26 08:38:28 -05:00
Robin Daermann
71db9b84e6
Allow spaces in monitor names
2016-03-24 14:37:24 +01:00
Andrew Bauer
77f7a3642c
remove check for "selected" property
2016-03-09 10:34:06 -06:00
Andrew Bauer
3280aff876
disable save button when nothing slected. fixes #1322
2016-03-09 09:43:44 -06:00
SteveGilvarry
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
SteveGilvarry
4837585601
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
...
Conflicts:
src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
SteveGilvarry
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Isaac Connor
172a4c6bd4
Add montagereview.php to autotools build.
2016-02-16 09:29:49 -05:00
Isaac Connor
5f217b48e0
When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP
2016-02-12 13:52:59 -05:00
Andrew Bauer
0b2a309014
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
...
960 montage review new feature
2016-02-08 20:40:04 -06:00
Isaac Connor
99dfaa97fa
User Name instead of ServerName and Hostname instead of ServerHostname
2016-01-08 10:15:21 -05:00
Isaac Connor
d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
Isaac Connor
44f3b99d24
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
2016-01-04 14:59:04 -05:00
Isaac Connor
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
Isaac Connor
cf7e168872
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
Isaac Connor
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
Isaac Connor
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
Isaac Connor
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
Isaac Connor
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
Isaac Connor
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
Isaac Connor
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
Andy Bauer
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
Isaac Connor
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -05:00
Isaac Connor
34f6590107
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:26 -05:00
Isaac Connor
aa91e69a9b
add monitorUrl to be used to target the recording server for the monitor
2015-12-01 15:17:49 -05:00
Isaac Connor
342326e159
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
2015-12-01 15:17:25 -05:00
Isaac Connor
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
Isaac Connor
fc85ccbf5f
Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.
2015-11-11 16:43:23 -05:00
Isaac Connor
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00
Isaac Connor
582cbe7567
Merge branch 'master' into multi-server
2015-10-15 09:01:19 -04:00
Pliable Pixels
d9355064e7
fixed orange display for monitor mode
2015-10-01 11:35:38 -04:00
Isaac Connor
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
Pliable Pixels
727486d8f3
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:25 -04:00
Pliable Pixels
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
Pliable Pixels
25ab1f6ddd
fixed recaptcha showing up pre DB update
2015-09-23 10:54:24 -04:00
Pliable Pixels
23d5e0e95b
fixed recaptcha showing up pre DB update
2015-09-23 10:50:15 -04:00
Isaac Connor
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
Isaac Connor
aac45e54b8
monitor array to class
2015-09-17 15:35:38 -04:00
Isaac Connor
c415399043
add Hostname to Server
2015-09-17 15:35:27 -04:00
Isaac Connor
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
Isaac Connor
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
Isaac Connor
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
Isaac Connor
e172911088
include Server object and fix Server dropdown
2015-09-16 14:51:05 -04:00
Isaac Connor
681718e908
init to avoid error message
2015-09-16 11:07:08 -04:00
Isaac Connor
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
Isaac Connor
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -04:00
Andrew Bauer
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
Pliable Pixels
2481c7a22e
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:43 -04:00
Isaac Connor
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
Pliable Pixels
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
Andy Bauer
395e628541
Merge branch 'new_rtsp_describe' of https://github.com/knnniggett/ZoneMinder into knnniggett-new_rtsp_describe
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-29 07:57:18 -05:00
Isaac Connor
75919c9cd5
Merge branch 'master' into multi-server
...
Conflicts:
docs/installationguide/ubuntu.rst
misc/apache.conf.in
src/zm_monitor.cpp
2015-08-27 10:34:47 -04:00
Isaac Connor
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
Isaac Connor
6093587ff2
Merge pull request #1039 from pliablepixels/1038-fixing-state-mgmt-1030-isActive-fix
...
1038 fixing state mgmt 1030 is active fix
2015-08-27 09:08:50 -04:00
Robin Daermann
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
Pliable Pixels
08d177185c
added oninput for text field handling
2015-08-26 11:22:09 -04:00
Pliable Pixels
02a6443c3b
Cleaned up button handling
2015-08-26 11:21:29 -04:00
Andrew Bauer
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
Andrew Bauer
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
Robin Daermann
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
Robin Daermann
b5fc6a9091
Make web correctly recognize new zone type
2015-08-20 15:09:02 +02:00
Isaac Connor
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
Isaac Connor
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
Andrew Bauer
fe3595bfa1
Merge branch 'add_analysis_interval' of https://github.com/manupap1/ZoneMinder into manupap1-add_analysis_interval
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_update-1.28.101.sql
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 20:20:53 -05:00
Andrew Bauer
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
Linwood-F
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
Linwood-F
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
Isaac Connor
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
Isaac Connor
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
Robin Daermann
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
Andrew Bauer
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
Andrew Bauer
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
Isaac Connor
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
Isaac Connor
99d674ef78
remove code that put a * next to the server name. It was copied from the user list and indicated the logged in user.
2015-08-16 12:22:31 -04:00
Isaac Connor
b3240bbc8f
set name=action on submit tag, and remove stuff that we don't want right now
2015-08-16 12:21:52 -04:00
Isaac Connor
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
Isaac Connor
9117e2949a
add server.php.
2015-08-16 10:52:47 -04:00
Andrew Bauer
c53bb7f56f
change edit permission from system to groups
2015-08-15 13:45:43 -05:00
Andrew Bauer
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
Andrew Bauer
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
Andrew Bauer
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
Andrew Bauer
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
Andrew Bauer
dff624a42c
Merge pull request #985 from ZoneMinder/fix_state_load
...
fix #948 1
2015-08-11 10:45:16 -05:00
Robin Daermann
078e18e6c5
Add label size to monitor options (frontend part)
...
This commit adds the option "Font size" to monitor options in the
timestamp panel. Includes translations of "Font size" for german
(de_de), french (fr_fr) and spanish (es_es). All other language files
contain the english text.
2015-08-10 15:35:19 +02:00
Linwood-F
3b5638e54d
Fix omitted reference to gif file
2015-08-09 13:12:45 -04:00
Linwood-F
6425df76c7
Switch to the standard routine in web functions include for auth
2015-08-09 13:10:43 -04:00
Linwood-F
7a76cb3df1
Add security for those using authorization
2015-08-09 12:24:04 -04:00
Linwood-F
9d7dc0d81b
Safari compatibility changes
2015-08-07 23:27:26 -04:00
Linwood-F
bf655b6656
Corrections from askers testing.
2015-08-07 22:26:03 -04:00
Linwood-F
3ce365ea8c
Tweaks to live display to remove sliders in fit mode and general fixes
2015-08-06 15:42:04 -04:00
Isaac Connor
4c8d7d7f62
quiet error when no Servers in Servers table
2015-08-04 11:48:04 -04:00
Isaac Connor
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
Linwood-F
278434ec3f
Fix regression in last commit where ALL not working
2015-08-03 22:00:00 -04:00
Linwood-F
76c037f06a
Fix bug in scale calling to zms
2015-08-03 16:36:14 -04:00
Linwood-F
e7264a8167
Minox fixes, make live mode default, 1 hour default
2015-08-03 15:31:13 -04:00
Linwood-F
42f77377f2
Add a fit feature to fit all monitos on screen
2015-08-02 16:15:18 -04:00
Linwood-F
4354cbeecb
More minor changes, last in prelude of next version
2015-07-30 19:01:27 -04:00
Linwood-F
3e85d57710
New version with added live view
2015-07-30 12:06:52 -04:00
root
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +02:00
Emmanuel Papin
1c8363cc29
Do not display 0.00 for AnalysisFPS
2015-07-24 00:27:47 +02:00
Emmanuel Papin
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
Linwood-F
a091ad16f3
Final cleanup before pull request
2015-07-23 15:36:21 -04:00
Linwood-F
b88403cd41
Minor corrections based on feedback to date
2015-07-23 15:01:53 -04:00
Emmanuel Papin
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
Linwood-F
84ed491765
Initial Montage Review for people to take a look at
2015-07-22 13:51:31 -04:00
Emmanuel Papin
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
Isaac Connor
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04:00
root
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
Isaac Connor
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
Isaac Connor
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
Pliable Pixels
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
Isaac Connor
f99c5f3627
use correct tag for the frame popup so that it gets the correct popup window size
2015-06-03 12:09:38 -04:00
Andrew Bauer
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
Andrew Bauer
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
Andrew Bauer
8a1625463c
Merge pull request #823 from ZoneMinder/fix_session_concurrency
...
close the session before requiring the page contents to fix the concurre...
2015-05-09 17:50:18 -05:00
Isaac Connor
01af58018b
close the session before requiring the page contents to fix the concurrency issue that exists due to using the file-backed session.
2015-04-20 13:06:34 -04:00
Emmanuel Papin
81eaf44595
Fix a bad SLANG key in monitor.php
2015-04-18 19:37:56 +02:00
Emmanuel Papin
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
Emmanuel Papin
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
SteveGilvarry
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
SteveGilvarry
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
Isaac Connor
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
Isaac Connor
bff26154b0
Also fix video.pho which has the same problem.
2015-02-23 14:31:15 -05:00
Isaac Connor
c9f109bc27
also fix timeline which has the same problem
2015-02-23 14:27:35 -05:00
Isaac Connor
dd714665bd
use explode instead of preg_split
2015-02-23 14:18:10 -05:00
Isaac Connor
bd3a9806b8
Fix sql query when user is limited to specific monitors
2015-02-23 14:16:04 -05:00
Isaac Connor
851a246cf2
Revert "Fix sql query when user is limited to specific monitors"
...
This reverts commit 41b581552e
.
2015-02-23 14:10:53 -05:00
Isaac Connor
41b581552e
Fix sql query when user is limited to specific monitors
2015-02-23 14:10:18 -05:00
Isaac Connor
9b0c8085eb
Merge pull request #720 from knnniggett/zmonvif
...
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 15:50:07 -05:00
Andrew Bauer
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
Andrew Bauer
b000b997e9
Merge pull request #709 from ZoneMinder/find_arp
...
try harder to find arp.
2015-02-21 11:53:26 -06:00
Andrew Bauer
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
Isaac Connor
438456ce93
include output if can't find arp
2015-02-19 15:43:34 -05:00
Andy Bauer
9f3ff787d1
Merge branch '478-onvif-support' of https://github.com/altaroca/ZoneMinder into altaroca-478-onvif-support
...
Conflicts:
CMakeLists.txt
configure.ac
db/zm_create.sql.in
distros/redhat/archive/zoneminder.el6.spec
distros/redhat/zoneminder.el6.spec
web/skins/classic/views/monitor.php
2015-02-18 18:53:47 -06:00
Isaac Connor
13c6be548d
If type -p doesn't work, try which, and if that doesn't work just try /usr/sbin/arp. Also don't bother with escapeshellcmd because these are not user inputs.
2015-02-17 15:39:59 -05:00
Isaac Connor
2b00ebd02c
if path results in an empty string, set it to something so that the link is there when type is vlc
2015-02-03 10:52:49 -05:00
Isaac Connor
bf688f2d39
trival quoting changes and missing semi colons
2015-02-02 19:06:45 -05:00
Isaac Connor
690a2f083e
fix montage layout broken by my skin merging
2015-02-02 19:06:20 -05:00
Steve Gilvarry
a44f83cb7d
#658 Fix error message for finding arp path
2015-01-05 07:58:39 +11:00
Isaac Connor
ddae55a1c9
Merge pull request #645 from ZoneMinder/skin_css_default
...
Skin css default
2014-12-29 12:00:44 -05:00
Isaac Connor
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
Isaac Connor
05206279df
add missing commas
2014-12-18 09:44:04 -05:00
Isaac Connor
478c9bc630
add custom lines for loading the available skins and css options
2014-12-18 09:34:14 -05:00
Isaac Connor
45feac3d36
Merge pull request #640 from jrd288/offer_login
...
Offer login prompt instead of throwing error
2014-12-16 09:35:08 -05:00
Andrew Bauer
c28206e8d1
Merge pull request #632 from ZoneMinder/better_security
...
better fix for the view=console security flaw.
2014-12-16 08:34:14 -06:00
jrd288
52d3ec7142
Fixed autotools build to reflect file name change
...
postlogin.js -> postlolgin.js.php
2014-12-15 18:11:06 -05:00
jrd288
f4289cd253
postlogin.js replaced by postlogin.js.php
2014-12-15 17:38:18 -05:00
jrd288
10dba9b4c2
Offer login instead of error
...
When a user accesses a view but receives an error, and is not logged
on, he is offered a login prompt instead. The login prompt saves the
original query URL in a hidden field, and postlogin redirects back to
the original URL once the user has logged on.
If the user is logged in and there is an error, no login prompt is
shown.
This allows the user to click an event link in an e-mail and then log
in before being shown the event, instead of requiring going back
through the front ZM page to log in.
2014-12-15 17:17:03 -05:00
Isaac Connor
3c8153c9b4
better fix for the view=console security flaw.
...
This does it in index.php,so it guards all pages, and also just changes the view to login, so instead of giving an error, it presents you with the login, which I think is better.
2014-12-12 09:38:54 -05:00
Isaac Connor
b1aa349f11
add check to see if user has rights to view this monitor
2014-12-12 09:32:03 -05:00
Isaac Connor
74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
SteveGilvarry
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
Isaac Connor
af0d9a1065
bug fix for listing the css options.
...
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
Isaac Connor
593f0781d6
this css directory was moved under /web/skins/classic/css/views so we don't need to have it in the SUBDIRS
2014-11-26 11:57:35 -05:00
Isaac Connor
193cb71b71
Add option for setting css to use with the skin. Also happens to add missing elements of the table for the skins tab and cleans up some spacing. Also, use a variable to tell whether to reload the page or not, which is required after you change the skin or css.
2014-11-26 11:55:53 -05:00
Isaac Connor
a412799003
Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match
2014-11-26 11:29:04 -05:00
Isaac Connor
9c30b806f2
don't require SystemView to view/select groups.
...
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
Jan M. Hochstein
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
Isaac Connor
2018228daf
fix V inputs
2014-08-21 11:58:51 -04:00
Isaac Connor
f93a28f2be
fixup multibuffering so it can have a null value which makes it fall back to config table
2014-08-21 11:13:38 -04:00
Jan M. Hochstein
5f1fda43a0
Basic support for SOAP 1.1 and 1.2
2014-08-17 21:24:27 +02:00
Jan M. Hochstein
99e794a97b
Removed hard coded binary path and perl binary location
2014-08-07 18:25:07 +02:00
Isaac Connor
0834e1b61d
I see no reason for these to be posts. They retrieve info, that's it.
2014-07-29 16:15:31 -04:00
Isaac Connor
96322dd59c
remove v4l tab that I never used
2014-07-29 14:45:02 -04:00
Isaac Connor
b2f1c2fe68
Merge branch 'v4l_to_monitor'
2014-07-24 14:35:23 -04:00
Isaac Connor
b3f078eaa5
add the word disabled after function if the monitor is not enabled.
2014-07-23 15:46:37 -04:00
Jan M. Hochstein
a91331de66
Added basic ONVIF support views
2014-07-14 20:59:36 +02:00
Jan M. Hochstein
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
Isaac Connor
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
Isaac Connor
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
Isaac Connor
2be38d7f32
fix problem editing users, a semi-colon screwed up the if statement.
...
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
2014-07-08 10:52:55 -04:00
Andrew Bauer
48d961082c
Determine full path to arp
2014-07-05 11:11:36 -05:00
Andrew Bauer
9a0eb63df2
Merge pull request #415 from m-bene/selectSkin
...
make skin selection persistent
2014-07-04 12:57:37 -05:00
Andrew Bauer
5aad658262
Fixes errors when opening Filters (issue #34 )
2014-07-04 11:00:00 -05:00
Isaac Connor
623837115b
fix missing ARRAY() around params to dbFetchOne
2014-06-25 14:01:45 -04:00
Isaac Connor
11718f0559
The users tab should always be available. It is useful to configure users BEFORE turning on auth.
2014-06-25 13:39:31 -04:00
m-bene
82447ebb27
remove unwanted comment change
2014-05-17 22:05:57 +02:00
m-bene
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
m-bene
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
m-bene
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
m-bene
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
m-bene
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
m-bene
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +02:00
Kfir Itzhak
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
Kfir Itzhak
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
m-bene
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
Sune1337
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
Andrew Bauer
35468af815
Merge pull request #338 from m-bene/extendPreclusive
...
add feature to extend preclusive zone alarm state by x frames
2014-04-08 08:04:37 -05:00
m-bene
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
Isaac Connor
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00