Isaac Connor
00ef849908
fix line testing for Hostname
2015-10-02 15:29:17 +00:00
Isaac Connor
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
Pliable Pixels
d751c3ad61
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:15 -04:00
Pliable Pixels
e5a6889253
fixed conflict
2015-09-24 15:51:16 -04:00
Pliable Pixels
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
Pliable Pixels
ae6fd7daea
fixed constant check when not defined
2015-09-24 09:57:43 -04:00
Isaac Connor
ba1100fc03
continue conversion from array to class of Monitor
2015-09-17 16:06:47 -04:00
Isaac Connor
01718aaffb
consturctor just takes an id
2015-09-17 15:34:26 -04:00
Isaac Connor
13327b7651
Load Controls if appropriate
2015-09-17 15:34:09 -04:00
Isaac Connor
52cdb8a05a
add Monitor class
2015-09-17 15:29:36 -04:00
Isaac Connor
ac5f42efcf
add a class for Server objects
2015-09-16 15:16:07 -04:00
Isaac Connor
a8ba32db64
add Server.php to autoconf build
2015-09-16 14:51:59 -04:00
Isaac Connor
73badd1c2d
check for value of ZM_SERVER_NAME and ZM_SERVER_HOST and include it in the error message
2015-09-16 11:12:04 -04:00
Isaac Connor
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
Isaac Connor
fb872315d1
add an error log entry for unknown action
2015-09-16 08:38:53 -04:00
Isaac Connor
b680aa41c5
save should be Save
2015-09-15 17:26:31 -04:00
Isaac Connor
d235733290
Need to include logger if we are going to use Error
2015-09-14 15:57:22 -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
22a7a1d53d
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:28 -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
feeb890be2
removed recaptcha client dependency
2015-08-29 15:14:20 -04:00
Pliable Pixels
f7fea2fe48
Removed dependency on recaptcha client library
2015-08-29 15:13:15 -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
Robin Daermann
d68e8e8f68
Restart capture process after deleting a Privacy zone
2015-08-27 10:12:54 +02:00
Robin Daermann
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
Andrew Bauer
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05: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
c78f39c106
Merge pull request #962 from Linwood-F/959-add-exif-date-time-to-images
...
959 add exif date time to images
2015-08-18 13:46:54 -05:00
Linwood-F
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
Andy Bauer
64299082ad
Send login activity to the zoneminder event log
2015-08-17 17:54:17 -05:00
Andrew Bauer
5b2155f551
define Groups permission for the default user
2015-08-15 16:47:07 -05:00
Andrew Bauer
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
Andrew Bauer
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
Andrew Bauer
2770e752b4
create new permission group "Groups" in php
2015-08-15 11:56:51 -05:00
Isaac Connor
441a82e611
fixup loading SERVER_ID from SERVER_NAME
2015-07-17 10:12:44 -04:00
Isaac Connor
69e1fd8b18
add code to convert the human readable config entry ZM_SERVER_NAME into ZM_SERVER_ID
2015-07-09 11:45:19 -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
Andrew Bauer
3a94712db2
add translate function
2015-05-10 08:10:30 -05:00
Andrew Bauer
4182fb3295
Don't show ONVIf probe link when ONVIF support is not enabled
2015-02-21 11:12:07 -06: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
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
