25ab1f6ddd
fixed recaptcha showing up pre DB update
2015-09-23 10:54:24 -04:00
23d5e0e95b
fixed recaptcha showing up pre DB update
2015-09-23 10:50:15 -04:00
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
aac45e54b8
monitor array to class
2015-09-17 15:35:38 -04:00
c415399043
add Hostname to Server
2015-09-17 15:35:27 -04:00
366c4ec676
monitor array to class
2015-09-17 15:35:09 -04:00
4a65ae1d2a
fix error in display of Server
2015-09-17 15:34:48 -04:00
0f181b72d1
include Server object and display the server column
2015-09-16 14:51:23 -04:00
e172911088
include Server object and fix Server dropdown
2015-09-16 14:51:05 -04:00
681718e908
init to avoid error message
2015-09-16 11:07:08 -04:00
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
4fa6948e5c
add form validation for server editing. Currently just requires a name
2015-09-16 09:12:21 -04:00
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
2481c7a22e
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:43 -04:00
bb41ebf776
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-08-31 16:03:40 -04:00
73fa051ef8
Google recaptcha
2015-08-29 13:29:52 -04:00
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
b2699237c7
put back mootools
2015-08-27 11:35:47 -04:00
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
1cf54d2e38
Merge pull request #1026 from schrorg/blacken-zones
...
Add new zone type - privacy zones
2015-08-27 09:14:16 -04:00
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
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
08d177185c
added oninput for text field handling
2015-08-26 11:22:09 -04:00
02a6443c3b
Cleaned up button handling
2015-08-26 11:21:29 -04:00
c60d1cbeca
Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons
...
Grey color for disabled buttons
2015-08-25 12:50:50 -04:00
a6f296d84e
Grey color for disabled buttons
2015-08-25 12:29:40 -04:00
a995d72ebd
add warning and help text for maxfps fields
2015-08-22 12:36:49 -05:00
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
5b465194f8
Renamed 'Blacken' zone type to 'Privacy'
2015-08-20 17:37:59 +02:00
b5fc6a9091
Make web correctly recognize new zone type
2015-08-20 15:09:02 +02:00
41637278c9
merge master
2015-08-19 16:08:12 -04:00
12da43afe7
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 14:01:28 -04:00
880e77b096
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2015-08-19 13:30:48 -04:00
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
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
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
3462b0e0ab
content for server edit popup
2015-08-17 12:42:20 -04:00
7eb07dbb65
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2015-08-17 12:30:54 -04:00
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02:00
299c629a20
Merge remote-tracking branch 'upstream/master' into large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
version
2015-08-17 13:42:36 +02:00
c17de4a00f
add Exif checkbox to monitor
2015-08-16 17:56:03 -05:00
32f6c92b02
replace php short open tag
2015-08-16 12:29:03 -05:00
4f07279d25
include server.php in autotools build
2015-08-16 12:25:23 -04:00
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
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
c0517b11ae
Merge branch 'master' into multi-server
2015-08-16 10:52:51 -04:00
9117e2949a
add server.php.
2015-08-16 10:52:47 -04:00
c53bb7f56f
change edit permission from system to groups
2015-08-15 13:45:43 -05:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
c051f3482b
add Groups to options again
2015-08-15 12:37:25 -05:00
1d97e9d1f9
Add Groups column to options
2015-08-15 12:24:48 -05:00
85e2b165b1
bump version to 1.28.101
2015-08-15 12:01:57 -05:00
dff624a42c
Merge pull request #985 from ZoneMinder/fix_state_load
...
fix #948 1
2015-08-11 10:45:16 -05:00
882bf76750
Merge pull request #986 from ZoneMinder/fix_948_3
...
quiet error when no Servers in Servers table
2015-08-11 10:45:04 -05:00
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
3b5638e54d
Fix omitted reference to gif file
2015-08-09 13:12:45 -04:00
6425df76c7
Switch to the standard routine in web functions include for auth
2015-08-09 13:10:43 -04:00
7a76cb3df1
Add security for those using authorization
2015-08-09 12:24:04 -04:00
9d7dc0d81b
Safari compatibility changes
2015-08-07 23:27:26 -04:00
bf655b6656
Corrections from askers testing.
2015-08-07 22:26:03 -04:00
3ce365ea8c
Tweaks to live display to remove sliders in fit mode and general fixes
2015-08-06 15:42:04 -04:00
37e01b504b
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 14:36:07 +02:00
c4f78d634c
CSS[skins/classic]: highlight current row in tables.
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-08-05 10:43:02 +10:00
4c8d7d7f62
quiet error when no Servers in Servers table
2015-08-04 11:48:04 -04:00
e178e1b1d6
fix #948 1
2015-08-04 11:37:11 -04:00
278434ec3f
Fix regression in last commit where ALL not working
2015-08-03 22:00:00 -04:00
76c037f06a
Fix bug in scale calling to zms
2015-08-03 16:36:14 -04:00
e7264a8167
Minox fixes, make live mode default, 1 hour default
2015-08-03 15:31:13 -04:00
42f77377f2
Add a fit feature to fit all monitos on screen
2015-08-02 16:15:18 -04:00
4354cbeecb
More minor changes, last in prelude of next version
2015-07-30 19:01:27 -04:00
3e85d57710
New version with added live view
2015-07-30 12:06:52 -04:00
651cffd3b5
Small color corrections in tabList
2015-07-27 10:07:01 +02:00
14ebd937c7
Added missing javascript file to Makefile.am
2015-07-27 09:53:59 +02:00
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
911f0fad28
Use destination color from CSS in transition effect in log view (instead
...
of #000000 )
2015-07-27 09:53:59 +02:00
1c8363cc29
Do not display 0.00 for AnalysisFPS
2015-07-24 00:27:47 +02:00
649a39b372
Replace analysis interval parameter by analysis framerate
2015-07-23 16:36:30 -04:00
a091ad16f3
Final cleanup before pull request
2015-07-23 15:36:21 -04:00
b88403cd41
Minor corrections based on feedback to date
2015-07-23 15:01:53 -04:00
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02:00
84ed491765
Initial Montage Review for people to take a look at
2015-07-22 13:51:31 -04:00
a6b7c6e99f
Add analysis interval parameter to monitors
2015-07-21 22:52:52 +02:00
02ee745167
parameter to defined should be in quotes
2015-07-17 10:09:22 -04:00
560a4cccbe
Show correct part of URL (hostname) for ffmpeg sources in console
2015-07-17 13:59:40 +02:00
cc5ca259ed
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-07-15 16:47:36 -04:00
ace8597b8d
Merge branch 'master' into multi-server
2015-07-14 16:10:51 -04:00
b12d72c68f
fix monitor popup size
2015-07-09 11:44:27 -04:00
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
1a0d4d2221
Console now shows custom run state in header (if applicable)
2015-06-21 09:31:21 -04:00
c8e41319e6
fix state popup dimensions
2015-06-03 12:22:12 -04:00
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
bf4038a724
followup changes based on comments in #833
2015-05-21 12:23:31 -05:00
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
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
9ecc934927
add the new js files for classic flat skins
2015-05-01 16:50:44 -04:00
013009f127
fix the css .js file name
2015-05-01 16:50:29 -04:00
91737eb28b
also reference a js file with the name of the chosen css. This is so that we can use different popup window sizes for flat because it's text and buttons are so much larger.
2015-05-01 16:03:40 -04:00
73cc4e5cab
move the window size definitions into a separate file for each css version flat or classic
2015-05-01 16:02:55 -04:00
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
81eaf44595
Fix a bad SLANG key in monitor.php
2015-04-18 19:37:56 +02:00
216348274b
Remove a remaining hardcoded string
2015-04-18 18:14:36 +02:00
ac8ace33f8
Remove hardcoded localized strings and update lang files
2015-04-18 17:14:14 +02:00
b2f6bfb5fc
upgrade bundled jQuery ( Closes : #785 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-15 11:39:29 +10:00
98d91ded90
Found some introduced short tags
2015-04-08 20:13:27 +10:00
45fd7f1eca
Found some old open tags left over
2015-04-08 20:11:26 +10:00
d1f00f02c2
skins/classic: fix HTML export with USE_DEEP_STORAGE ( Closes : #506 ).
...
Use mygetEventPath() to get valid path.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-04-04 20:39:06 +11:00
1a17c820f2
Merge pull request #730 from ljack/master
...
Fix image and css import paths for style/skin named "flat"
2015-02-25 11:51:42 -05:00
e9384d445a
fix .upBtn and .downBtn also for "flat" css
2015-02-25 18:10:40 +02:00
8616fdb33d
fix import path
2015-02-25 18:09:23 +02:00
6233432559
fix import path
2015-02-25 18:08:41 +02:00
48950f3f1c
Update control.css
...
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
362153cb3a
Also fix video.pho which has the same problem.
2015-02-23 14:34:13 -05:00
bff26154b0
Also fix video.pho which has the same problem.
2015-02-23 14:31:15 -05:00
c9f109bc27
also fix timeline which has the same problem
2015-02-23 14:27:35 -05:00
dd714665bd
use explode instead of preg_split
2015-02-23 14:18:10 -05:00
bd3a9806b8
Fix sql query when user is limited to specific monitors
2015-02-23 14:16:04 -05:00
851a246cf2
Revert "Fix sql query when user is limited to specific monitors"
...
This reverts commit 41b581552e
2015-02-23 14:10:53 -05:00
41b581552e
Fix sql query when user is limited to specific monitors
2015-02-23 14:10:18 -05:00
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
7ef503ff59
User configurable arp tool
2015-02-21 13:08:04 -06:00
b000b997e9
Merge pull request #709 from ZoneMinder/find_arp
...
try harder to find arp.
2015-02-21 11:53:26 -06:00
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06:00
438456ce93
include output if can't find arp
2015-02-19 15:43:34 -05:00
c3f96ad8ca
fix path to the zone point gif
2015-02-19 11:11:01 -05:00
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
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
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
bf688f2d39
trival quoting changes and missing semi colons
2015-02-02 19:06:45 -05:00
690a2f083e
fix montage layout broken by my skin merging
2015-02-02 19:06:20 -05:00
2328ae8792
remove 50% width so that header auto-fits
2015-01-28 14:05:29 -05:00
a44f83cb7d
#658 Fix error message for finding arp path
2015-01-05 07:58:39 +11:00
ddae55a1c9
Merge pull request #645 from ZoneMinder/skin_css_default
...
Skin css default
2014-12-29 12:00:44 -05:00
1131809c92
format duration into HH:MM:SS
2014-12-19 10:18:27 -05:00
05206279df
add missing commas
2014-12-18 09:44:04 -05:00
478c9bc630
add custom lines for loading the available skins and css options
2014-12-18 09:34:14 -05:00
45feac3d36
Merge pull request #640 from jrd288/offer_login
...
Offer login prompt instead of throwing error
2014-12-16 09:35:08 -05:00
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
52d3ec7142
Fixed autotools build to reflect file name change
...
postlogin.js -> postlolgin.js.php
2014-12-15 18:11:06 -05:00
f4289cd253
postlogin.js replaced by postlogin.js.php
2014-12-15 17:38:18 -05:00
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
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
b1aa349f11
add check to see if user has rights to view this monitor
2014-12-12 09:32:03 -05:00
74da3e9c02
fix auth requirement by checking for user when AUTH is on
2014-12-11 17:09:18 -05:00
fafef86298
Merge branch 'control_improvements'
2014-12-08 16:52:52 -05:00
27b9001eb4
default MoveRoot to empty to quiet an error in logs
2014-12-08 16:52:10 -05:00
5abc58ea14
Merge pull request #620 from SteveGilvarry/11-php-short-tags
...
Replace PHP Short Open Tags - Fixes #11
Works for me too.
2014-12-08 14:39:24 -05:00
2c1e4a9965
fix the paths so that the ptzControls are visible
2014-12-08 10:34:25 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
f57f903aa6
Add views subdir
2014-12-01 16:10:01 -05:00
af0d9a1065
bug fix for listing the css options.
...
use SELECTED="SELECTED" instead of just SELECTED
2014-12-01 15:58:00 -05:00
fed12291be
add flat to the subdirs
2014-12-01 15:57:44 -05:00
82c01479c6
move flat css files into the classic skin.
...
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
ebe602616b
needs this one too
2014-11-26 14:30:53 -05:00
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
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
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
bf3ec7b490
Since the css files are in subdirectories now, thise just needs to reference them
2014-11-26 11:24:55 -05:00
ebb31f12d2
Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use.
2014-11-26 11:23:06 -05:00
53b70d27fb
Use the global variable which gets setup in web/index.php to look in a subdirectory of web/skins/classic/css to find the css files.
2014-11-26 11:18:03 -05:00
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
8d225566b1
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-20 15:32:30 -04:00
7ea003441d
Merge pull request #371 from m-bene/resizeWindows
...
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
f1b2ba091c
Update meta makefiles
2014-09-12 16:06:19 +02:00
2018228daf
fix V inputs
2014-08-21 11:58:51 -04:00
707f2e84db
increase monitor popup height to fit v4l settings in
2014-08-21 11:14:48 -04:00
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
5f1fda43a0
Basic support for SOAP 1.1 and 1.2
2014-08-17 21:24:27 +02:00
99e794a97b
Removed hard coded binary path and perl binary location
2014-08-07 18:25:07 +02:00
0834e1b61d
I see no reason for these to be posts. They retrieve info, that's it.
2014-07-29 16:15:31 -04:00
96322dd59c
remove v4l tab that I never used
2014-07-29 14:45:02 -04:00
b2f1c2fe68
Merge branch 'v4l_to_monitor'
2014-07-24 14:35:23 -04:00
b3f078eaa5
add the word disabled after function if the monitor is not enabled.
2014-07-23 15:46:37 -04:00
a91331de66
Added basic ONVIF support views
2014-07-14 20:59:36 +02:00
0a2515c00e
Added basic ONVIF support
2014-07-14 20:36:18 +02:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
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
48d961082c
Determine full path to arp
2014-07-05 11:11:36 -05:00
c2e2a12995
Merge pull request #406 from m-bene/focusPopup
...
focus popup windows
2014-07-04 13:00:45 -05:00
9a0eb63df2
Merge pull request #415 from m-bene/selectSkin
...
make skin selection persistent
2014-07-04 12:57:37 -05:00
5aad658262
Fixes errors when opening Filters (issue #34 )
2014-07-04 11:00:00 -05:00
623837115b
fix missing ARRAY() around params to dbFetchOne
2014-06-25 14:01:45 -04:00
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
8ac6ce17bc
Fixed issue DateTime handling in filter queries that broke timeline view.
2014-06-15 13:05:25 -07:00
82447ebb27
remove unwanted comment change
2014-05-17 22:05:57 +02:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
de107f77ba
fix option help text for overlooked languages
2014-05-17 04:51:01 +02:00
9a71a0068a
add help window for ffmpeg/libvlc options
2014-05-17 04:33:33 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
b197f985e0
make expiry date relative (~10years)
2014-05-01 09:53:45 +02:00
ed7ca66045
make skin selection cookie persistent
2014-05-01 09:37:39 +02:00
2881e6b643
focus popup windows
2014-04-26 04:07:33 +02:00
1f29aa432a
Minor corrections to the cURL source type in the web interface
2014-04-23 12:12:41 +03:00
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
f737af15b9
Fix reload loop on switching skins
2014-04-11 09:40:23 +02:00
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
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
9a714f8d6d
Fix 'Undefined index: filter' php warnings for filter view when called without filter arguments
2014-04-07 16:11:48 +02:00
9edb55d9af
Modify window size to exclude task bar area
2014-04-07 12:07:29 +02:00
d6a27b31e8
fix extra }
2014-03-24 13:44:06 -04:00
bfb52ab9aa
fix groups
2014-03-21 23:10:13 -04:00
967dda737c
more copying mysql2PDO from classic. Also, some fixes in classic
2014-03-21 17:16:56 -04:00
ffa952419c
Merge branch 'mysql2PDO'
...
Conflicts:
distros/ubuntu1204/changelog
scripts/ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm
web/includes/actions.php
2014-03-20 16:48:03 -04:00
2784b3d1f5
Merge master
2014-03-20 10:26:12 +01:00
2345889d64
include ExtendAlarmFrames in Presets and enable input for preclusive zones only
2014-03-20 09:53:47 +01:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
c2b93c3caf
Merge remote branch 'nagyrobi/patch-26' into nagyrobi
2014-02-26 09:32:58 -06:00
fb698a6755
Merge remote branch 'nagyrobi/patch-23' into nagyrobi
2014-02-26 09:17:14 -06:00
5b1c79e3d0
Merge remote branch 'nagyrobi/patch-22' into nagyrobi
2014-02-26 09:16:51 -06:00
1dd8dc4aa6
Merge remote branch 'nagyrobi/patch-21' into nagyrobi
2014-02-26 09:15:47 -06:00
805981e06a
Merge remote branch 'nagyrobi/patch-4' into nagyrobi
...
Conflicts:
web/skins/classic/js/skin.js
2014-02-26 09:04:19 -06:00
18d56e20aa
Merge remote branch 'nagyrobi/patch-13' into nagyrobi
2014-02-26 08:46:21 -06:00
dee44c8f8d
Merge remote branch 'nagyrobi/patch-12' into nagyrobi
2014-02-26 08:45:57 -06:00
c899de65a4
Merge remote branch 'nagyrobi/patch-5' into nagyrobi
2014-02-26 07:55:36 -06:00
26be1bd041
Fix builtin authentication issue caused by commit 6e5d927
2014-02-14 18:56:27 -06:00
d20e0ee2e7
Temporary workaround to show all ptz control types regardless of monitor source type.
2014-02-13 08:43:19 -06:00
b2a65dc343
cURL minor corrections and improvements
2014-01-10 09:17:12 +02:00
9901ce9e84
Merge remote branch 'origin/master' into curl
2014-01-05 10:16:01 +02:00
a962815624
Change default alarm blend percent to 6 and make upgrades smooth by copying the existing blend percent to the alarm one
2014-01-05 08:59:09 +02:00
b3af313370
Merge pull request #282 from scottgrobinson/master
...
Add zmMontageScale so montage scale is also 'saved'
2014-01-02 11:18:39 -08:00
e6b9b8218b
Enclose value of the Notes attribute with quotes.
2013-12-31 17:32:20 -06:00
ff9a26273c
cURL is now working!
2013-12-27 18:02:32 +02:00
bf708a8373
Merge branch 'master' into curl
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
2013-12-27 14:21:12 +02:00
375d67cdf2
Update montage.php
...
Make use of new zmMontageScale cookie
2013-12-22 20:56:18 +00:00
db41693fd6
Update montage.js
...
save montage scale % as cookie
2013-12-22 20:53:09 +00:00
14024451e5
Monitor link now displays for all valid libvlc paths.
2013-12-22 01:29:40 +00:00
3201e5a431
Adds web ui support for libvlc camera.
2013-12-19 21:51:39 +00:00
cad33ddb96
Removed embedded jquery, instead include by <script>. Fixes #274
2013-12-17 13:41:55 -05:00
1a744ebed6
Added jquery 1.4.2.min.js to the classic skin's js dir
2013-12-17 13:41:36 -05:00
3393a63525
more updates
2013-12-17 12:53:15 -05:00
f39f2fab66
Merge pull request #241 from ZoneMinder/alarmrefblendoption
...
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
529c124a9c
Detection Support for WansView Cams
...
Support for detection of Wansview Cams which are connected by lan
2013-12-11 11:29:30 +01:00
e9f4479171
Added support for UYVY capture palette (required for some Bluecherry cards)
2013-12-10 15:13:48 +02:00
55dadcf758
Network Detection Support for Wansview
...
Basis support for Wansview Cams
Tested with NC541W
2013-11-30 20:46:59 +01:00
1519db78ce
add ServerHost filter
2013-11-13 10:13:09 -05:00
a155082997
use parameter passing instead of esacping
2013-11-12 15:39:29 -05:00
b8f075499b
fix for debian bug #725840 Javascript errors in updateButtons function of filter.js
...
Also a slight optimisation using else's instead of continuing to evaluate after the true value has been set.
2013-11-08 11:47:19 -05:00
463d8a136f
Merge branch 'master' into mysql2PDO
...
Conflicts:
zm.conf.in
2013-11-08 11:22:09 -05:00
f73585dbaa
Few web interface corrections regarding cURL
2013-11-04 17:28:15 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
fd656c55cf
Changed default blend percentages and the dropdown list for alarm reference image blend
2013-11-04 12:10:53 +02:00
2d0f4dffd1
Fix a missing NULL second paramter to dbFetchAll
2013-11-03 16:06:31 -05:00
59b841958d
use parameter passing instead of explicit exscaping
2013-11-03 15:40:00 -05:00
833705b613
Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled
2013-11-03 10:26:04 +02:00
b368d306b9
Fix marker-out-of-bounds crash when defining zone points
2013-11-02 15:56:42 -07:00
93560652f1
make sortorder be asc or desc, not something arbitrary which needs to be escaped
...
other fixes to use parameter passing to PDO instead of escaping them ourselves
2013-11-01 12:30:07 -04:00
ae51ac5519
redo changes to use new dbFetch functions with parameter arrays
2013-10-18 14:24:08 -04:00
cde89a7144
more quoting removal, some slight optimisations
2013-10-17 21:03:24 -04:00
ef765afa2d
Merge branch 'master' into mysql2PDO
2013-10-17 17:02:44 -04:00
355c10c3a4
fix error when strict modes is on.
2013-10-17 17:02:17 -04:00
2a45506bff
more quoting removal
2013-10-17 16:15:04 -04:00
36c4fad644
remove extra quoets since dbEcape does quoting now
2013-10-17 15:35:23 -04:00
34f84a4097
Merge branch 'v1.26.4-beta'
2013-10-03 10:14:09 -04:00
7e91053761
increase the hegiht of the window a bit, the contents are larger
2013-09-23 10:03:33 -04:00
6d00540b5d
Improve Chrome browser support & log streaming events
2013-09-21 14:52:41 -05:00
ab1314f250
clean out autogenerated files
2013-09-12 14:43:57 -04:00
c8ad6ae656
Fixes #107 for real this time.
2013-09-05 20:31:52 -04:00
bd4aae4c1e
Update console.php
...
Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:08:38 +02:00
a186981278
Update monitor.php
...
Enable localization of the monitor function names in the monitor settings window.
2013-08-16 13:48:25 +02:00
0c098e2b0f
Update function.php
...
Enable localization of the monitor function names in the function window.
2013-08-16 13:41:33 +02:00
ff9cbeff6b
Update console.php
...
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02:00
bc18a27072
Update skin.js
...
Increased popup window sizes just a little bit, to prevent the longer foreign language translated strings to break window layouts.
Fine-tuned again, I hope that's the final one :-)
2013-08-16 10:13:35 +02:00
9c7653ca68
Update timeline.php
...
Enable localization of the usage instructions in the Timeline window.
2013-08-15 18:58:08 +02:00
8ce4d302dd
Update montage.php
...
Enable localization of the dropdown box items in the montage window.
2013-08-15 18:56:01 +02:00
2b0647a52c
Update skin.css
...
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
2013-08-15 12:48:04 +02:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
266b67d0bd
Support for control when monitor source is ffmpeg. This should fix #16 .
2013-08-13 08:34:37 -04:00
3a305522c4
Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop
2013-07-25 11:50:24 -04:00
cdac403fb1
Merge ../zum into develop
...
Conflicts:
AUTHORS
configure.ac
db/zm_create.sql.in
scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
scripts/zmupdate.pl.in
src/Makefile.am
src/zm_buffer.cpp
src/zm_config_defines.h
src/zm_event.cpp
src/zm_ffmpeg.h
src/zm_ffmpeg_camera.cpp
src/zm_image.cpp
src/zm_jpeg.h
src/zm_local_camera.cpp
src/zm_logger.cpp
src/zm_mem_utils.h
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_mpeg.cpp
src/zm_remote_camera_http.cpp
src/zm_remote_camera_rtsp.cpp
src/zm_rtsp.cpp
src/zm_sdp.cpp
src/zm_sdp.h
src/zm_stream.cpp
src/zm_thread.cpp
src/zm_thread.h
src/zm_threaddata.cpp
src/zm_user.cpp
src/zm_user.h
src/zm_utils.cpp
src/zm_zone.cpp
src/zm_zone.h
web/includes/actions.php
web/lang/big5_big5.php
web/lang/cn_zh.php
web/lang/cs_cz.php
web/lang/de_de.php
web/lang/dk_dk.php
web/lang/en_gb.php
web/lang/es_ar.php
web/lang/et_ee.php
web/lang/fr_fr.php
web/lang/he_il.php
web/lang/hu_hu.php
web/lang/it_it.php
web/lang/ja_jp.php
web/lang/nl_nl.php
web/lang/pl_pl.php
web/lang/pt_br.php
web/lang/ro_ro.php
web/lang/ru_ru.php
web/lang/se_se.php
web/skins/classic/js/skin.js
web/skins/classic/views/js/monitor.js.php
web/skins/classic/views/monitor.php
web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
bb19e80fa8
Support for control when monitor source is ffmpeg. This should fix #16 .
...
Some IP cameras need the source set to ffmpeg even though they are remote
cameras. These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
3a8481a591
cleanup
2013-05-10 14:02:22 -04:00
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
9d89fb3bcb
Merge branch 'kfir-proper' into develop
2013-05-10 12:23:58 -04:00
0a3ffb5e2e
fix control types dropdown for a new monitor
2013-05-09 14:11:20 -04:00
7cf5475542
Merge ../ZoneMinder-kfir into kfir-proper
...
Conflicts:
configure
src/Makefile.am
src/Makefile.in
2013-05-02 21:28:51 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
0fe55a18bf
Something useable :)
...
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
2012-07-15 17:30:37 +03:00
a6c7acd02a
Some more progress on the deinterlacing code.
2012-07-13 20:11:16 +03:00
f27b424503
Much more progress!
...
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
8f0ec42ba2
First work on adding built-in deinterlacing to ZM.
2012-07-13 20:11:16 +03:00
4996dd0a51
Recreated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
be97b244b4
Increased size of options window and changed to use debug functions instead of console ones.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3659 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 08:58:19 +00:00
2dfdc8129c
Few small fixes:
...
1) Added a workaround against SWS_CPU_CAPS_SSE2 not being defined.
2) Fixed enableDisableAlarms javascript error.
3) swscale unsupported format errors now include the unsupported format in the error.
4) Fixed a small error affecting local cameras with rotation enabled.
2012-03-07 14:33:09 +02:00
d5fbd351b3
Small corrections
2012-02-01 07:33:21 +02:00
be8ef02a7c
Small corrections
2012-02-01 07:33:21 +02:00
b4921c4403
1) Made 24bit the default target colorspace.
...
2) Changed crop info's layout.
2012-02-01 07:33:21 +02:00
066fe89718
Added automatic capture palette selection.
2012-02-01 07:33:21 +02:00
bdf0687550
1) Added support for JPEG and MJPEG capture palettes - needs to be tested
...
2) Allow the blend percent to be zero, to disable blending
2012-02-01 07:33:20 +02:00
8ac3dda54b
1) Removal of the ZM_LOCAL_BGR_INVERT option.
...
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
2012-02-01 07:33:20 +02:00
eeaed7ccd3
Some small changes
...
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
2012-02-01 07:33:20 +02:00
642a1bfdb2
1) RTSP support for direct capture and target colorspace.
...
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
2012-02-01 07:33:20 +02:00
b0bc227232
1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
...
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
2012-02-01 07:33:20 +02:00
c3ecdd00e0
1) Relocated conversion functions and tables to zm_image.cpp
...
2) SSE2 aligned memcpy now functional
3) Fixed fill functions bug from an earlier commit
4) Many changes to zm_local_camera.cpp format selection
5) Fixed memory leak in AssignDirect()
6) Fixed Target Colorspace webinterface issues
7) Small other changes
2012-02-01 07:33:20 +02:00
2c47a15f9b
Use event dimensions instead of monitor ones as they may have changed.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:53:29 +00:00
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
3a399378b2
Fixed problem with link to overlay css file
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-27 16:09:09 +00:00
Pliable Pixels
Dmitry Smirnov
Isaac Connor
Andrew Bauer
Isaac Connor
Robin Daermann
Andrew Bauer
Linwood-F
Emmanuel Papin
SteveGilvarry
ljack
Steve Gilvarry
jrd288
Jan M. Hochstein
tim
m-bene
Kfir Itzhak
Sune1337
Adam J. Henry
Scott Robinson
Edward Barnard
Kyle Johnson
Kyle Johnson
Philipp Rehs
David Nesting
Isaac Connor
Isaac Connor
nagyrobi
nextime
stan