6cfd993890
Merge branch 'master' into multi-server
2015-12-09 10:43:38 -05:00
53dec9f26d
check for setting of __REQUEST['object'] to silence php NOTICE
2015-12-09 10:43:23 -05:00
e6c9830728
Use Monitor class instead of old sql
2015-12-09 09:23:36 -05:00
e4d51e1819
Merge branch 'master' into multi-server
2015-09-28 10:04:23 -04:00
d751c3ad61
recaptcha now displays translated message if secret is wrong
2015-09-25 11:11:15 -04:00
e5a6889253
fixed conflict
2015-09-24 15:51:16 -04:00
23b549a471
recaptcha fixes to avoid lockout
2015-09-24 15:44:35 -04:00
ae6fd7daea
fixed constant check when not defined
2015-09-24 09:57:43 -04:00
535a760f26
Merge branch 'master' into multi-server
...
Conflicts:
configure.ac
2015-09-16 09:12:55 -04:00
fb872315d1
add an error log entry for unknown action
2015-09-16 08:38:53 -04:00
b680aa41c5
save should be Save
2015-09-15 17:26:31 -04:00
04fcc253bd
Merge pull request #1048 from pliablepixels/1046-google-recaptcha
...
Google recaptcha
2015-09-01 08:18:54 -05:00
22a7a1d53d
Handled situation where user enables captcha but forgets to supply keys
2015-08-31 20:39:28 -04:00
f7fea2fe48
Removed dependency on recaptcha client library
2015-08-29 15:13:15 -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
d68e8e8f68
Restart capture process after deleting a Privacy zone
2015-08-27 10:12:54 +02:00
dc8a3769e7
Make the capture process restart if a Privacy zone got changed
2015-08-27 09:45:12 +02:00
2fbf79674b
Add RTSP Describe checkbox to web console
2015-08-21 10:32:50 -05:00
987db68452
Fix extra image copy; fix options unset of exif toggle
2015-08-18 14:39:55 -04:00
0dc35553ef
modify group delete action
2015-08-15 14:03:11 -05:00
1d688be1a1
propagate canEditGroup permission
2015-08-15 13:22:13 -05:00
2770e752b4
create new permission group "Groups" in php
2015-08-15 11:56:51 -05:00
04366e752a
add Servers to options, a server editing popup and a server selection to monitors
2015-07-09 11:41:46 -04:00
8657d0a243
Merge pull request #696 from ZoneMinder/improve_deleteEvent
...
Improve delete event
2015-02-09 07:15:27 -06:00
4524a61a50
prevent error message in log when Enabled is not checked
2015-02-06 14:15:26 -05:00
bcdac0104f
pass a minimum event hash instead of the event id to deleteEvent
2015-02-06 11:50:07 -05:00
74929236e3
put the sendControlCommand(quit) into the right place
2015-01-07 16:56:10 -05:00
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
4c864aec35
fix saving groups
2014-11-25 14:29:15 -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
5bf894d263
guard against unsafe monitor name
2014-06-05 15:23:15 -04:00
0689e8453c
guard against dangerous (old or new) monitor names
...
by rogerroger288
2014-06-05 15:21:28 -04:00
baf5da9561
guard against monitor names being dangerous
...
by rogerroger288
2014-06-05 15:20:04 -04:00
5ae3cb8907
merge some security fixes from rogerroger288
2014-06-05 15:14:12 -04:00
28f62c4f8f
remove call of undefined "fixDevices" function
2014-04-26 04:23:36 +02:00
0c58957e04
fixes
2013-12-17 14:58:06 -05:00
51455b5c85
more updates and removal of escaping and quoting
2013-11-04 12:43:34 -05:00
0979830b91
more removal of exra quotes
2013-10-17 15:54:17 -04:00
ed9f647dd7
Update actions.php
...
SQL-ERR 'Incorrect integer value: '' for column 'Enabled' at row 1', statement was 'update Monitors set Function = 'Monitor', Enabled = '' where Id = '2''
2013-09-13 03:48:01 -07:00
33cbd89212
Migrate svn to git
2013-03-17 00:45:21 +01:00
Isaac Connor
Pliable Pixels
Andrew Bauer
Robin Daermann
Andrew Bauer
Linwood-F
Isaac Connor
m-bene
Serguei S. Dukachev
nextime