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
2b53e439b9
Add Capture Resolution to replace Capture Width and Capture Height
2015-02-11 13:14:51 -05:00
Andrew Bauer
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
Isaac Connor
4524a61a50
prevent error message in log when Enabled is not checked
2015-02-06 14:15:26 -05:00
Isaac Connor
fed6748c6d
fixes to format date into zero padding and year as 2 digit
2015-02-06 13:00:55 -05:00
Isaac Connor
dbac099223
we don't use EndTime so don't load it
2015-02-06 11:50:23 -05:00
Isaac Connor
bcdac0104f
pass a minimum event hash instead of the event id to deleteEvent
2015-02-06 11:50:07 -05:00
Isaac Connor
9a1e210849
add comment
2015-02-06 11:46:35 -05:00
Isaac Connor
02a6c78182
make deleteEvent take either an event object or an eid.
...
load the relevant event data if passed an eid.
Use the StartTime to get to the event files instead of globbing the entire events path under the monitor.
2015-02-06 11:41:37 -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
Isaac Connor
2328ae8792
remove 50% width so that header auto-fits
2015-01-28 14:05:29 -05:00
Andrew Bauer
d787ad3f7a
Merge pull request #666 from ZoneMinder/kill_zmcontrol
...
Kill zmcontrol
2015-01-07 17:28:08 -06:00
Isaac Connor
74929236e3
put the sendControlCommand(quit) into the right place
2015-01-07 16:56:10 -05:00
Isaac Connor
d0138af00c
use new sendControlCommand function to send normal commands as well as send the quit command on monitor edit.
2015-01-07 16:24:34 -05:00
Isaac Connor
2e48c2ba3d
add sendControlCommand function to do the heavy work of sending zmcontrol a command
2015-01-07 16:24:07 -05:00
Hannes
4508c541ef
Update et_ee.php
...
Fixing Some problems
Parse error: syntax error, unexpected 'Parameters' (T_STRING) in /usr/share/zoneminder/lang/et_ee.php
2015-01-06 17:10:58 +02:00
Steve Gilvarry
a44f83cb7d
#658 Fix error message for finding arp path
2015-01-05 07:58:39 +11:00
Isaac Connor
1cfec7e3e7
Move require of config.php and logger up higher
2015-01-04 11:50:24 -05:00
Andrew Bauer
ac80649e26
Merge pull request #657 from ZoneMinder/log_export_use_PATH_SWAP
...
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 14:28:18 -06:00
Isaac Connor
3f64f9d919
Make the log export use ZM_PATH_SWAP and report the full path on error
2015-01-03 15:16:19 -05:00
Günter Grodotzki
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01: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
50e6784779
this adds two config options to System tab to set the default skin and css
2014-12-17 16:45:41 -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
Isaac Connor
fafef86298
Merge branch 'control_improvements'
2014-12-08 16:52:52 -05:00
Isaac Connor
27b9001eb4
default MoveRoot to empty to quiet an error in logs
2014-12-08 16:52:10 -05:00
Isaac Connor
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
Isaac Connor
2c1e4a9965
fix the paths so that the ptzControls are visible
2014-12-08 10:34:25 -05:00
SteveGilvarry
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
Isaac Connor
f57f903aa6
Add views subdir
2014-12-01 16:10:01 -05: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
fed12291be
add flat to the subdirs
2014-12-01 15:57:44 -05:00
Isaac Connor
9f7d31949d
remove the flat subdir
2014-12-01 15:55:22 -05:00
Isaac Connor
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
Isaac Connor
d7e08559d6
Merge pull request #582 from hanzese/patch-1
...
Update et_ee.php
2014-12-01 15:34:53 -05:00
Hannes
e60919f19a
Update et_ee.php
...
Translating some code comments.
2014-11-27 03:51:40 +02:00
Hannes
92b65c553e
Update et_ee.php
...
Changing back charset-utf-8.
2014-11-27 03:43:59 +02:00
Isaac Connor
ebe602616b
needs this one too
2014-11-26 14:30:53 -05:00