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
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
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
132e0a1798
Add analysis fps paramter to monitors
2015-07-22 21:38:35 +02: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
70c63bd394
Merge branch 'master' into storageareas
...
Conflicts:
db/zm_create.sql.in
distros/debian/control
distros/ubuntu1204/changelog
src/CMakeLists.txt
src/zm_config_defines.h
src/zm_monitor.h
2014-11-19 14:11:39 -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
Isaac Connor
Isaac Connor
Robin Daermann
Pliable Pixels
Andrew Bauer
Linwood-F
Andrew Bauer
Dmitry Smirnov
Emmanuel Papin
SteveGilvarry
ljack
Steve Gilvarry
jrd288
Jan M. Hochstein