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
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
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
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
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
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
Isaac Connor
2e48c2ba3d
add sendControlCommand function to do the heavy work of sending zmcontrol a command
2015-01-07 16:24:07 -05:00
Günter Grodotzki
8350ddac7c
replace getLoad() / getDiskPercent() with PHP native functions
2015-01-03 19:22:19 +01:00
SteveGilvarry
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
Isaac Connor
4c864aec35
fix saving groups
2014-11-25 14:29:15 -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
Isaac Connor
bec58a6011
fixes WRT to db logging. I believe fixes issue #504
2014-09-26 14:43:58 -04:00
Andrew Bauer
aa3803cb0b
Update functions.php
...
A more efficient check for IE >= 11 than the previous commit
2014-09-13 09:47:22 -05:00
Andrew Bauer
91b99b97a5
Update functions.php
...
Add logic to detect the User Agent string from IE11 (and potentially newer).
2014-09-13 08:19:08 -05:00
Isaac Connor
5bf894d263
guard against unsafe monitor name
2014-06-05 15:23:15 -04:00
Isaac Connor
0689e8453c
guard against dangerous (old or new) monitor names
...
by rogerroger288
2014-06-05 15:21:28 -04:00
Isaac Connor
baf5da9561
guard against monitor names being dangerous
...
by rogerroger288
2014-06-05 15:20:04 -04:00
Isaac Connor
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04:00
m-bene
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
Maciej Czerniak
50a9055601
fix sql error which prevents remote login from working
2014-04-13 09:54:11 +02:00
m-bene
f22b956b8b
do not quote column names in parse filter
2014-04-08 09:07:59 +02:00
Isaac Connor
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
Andrew Bauer
f435435481
Merge remote branch 'nagyrobi/patch-17' into nagyrobi
2014-02-26 09:15:05 -06:00
Andrew Bauer
b4679f0a8c
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
...
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.
These definitions are removed from here and added with checking option to the later stage after loading the language files.
2014-02-26 09:14:04 -06:00
