Commit Graph

5980 Commits

Author SHA1 Message Date
arjunrc e0c5b2a78f added consoleEvents API 2016-05-19 15:15:48 -04:00
arjunrc 13feb96811 added alarm apis 2016-05-19 15:06:41 -04:00
Isaac Connor 924acf4284 fix zmdc.pl hang due to needing to connect to db after fork 2016-05-19 15:01:31 -04:00
arjunrc 4018cab743 don't pass partial data to daemoncontrol 2016-05-19 14:53:16 -04:00
Isaac Connor 8e06c0ec63 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-19 12:08:56 -04:00
Isaac Connor 183f9c70a4 Must use ZoneMinder instead of ZoneMinder::Logger 2016-05-19 12:08:45 -04:00
Andrew Bauer 8bac5fbdfb typo - remove extra comma 2016-05-18 16:58:04 -05:00
Steve Gilvarry b4b9c1f2c0 Merge pull request #1491 from ZoneMinder/gcc6_fix
quick fix for gcc6
2016-05-17 23:39:56 +10:00
Isaac Connor 09e4aca0be add libdata-uuid-perl to debian/ubuntu dependencies 2016-05-17 09:26:36 -04:00
Isaac Connor a826931f0b Merge pull request #1411 from altaroca/onvif-discovery-1346
Improved WS-Discovery standard compliance
2016-05-17 09:23:49 -04:00
Isaac Connor 58d326681a quick fix for gcc6 2016-05-17 09:17:19 -04:00
Isaac Connor 435a1f7a2e remove duplicated locking code created by bind_fixes 2016-05-17 09:11:52 -04:00
Isaac Connor 20c4d07a00 Merge branch 'master' into hide_rtspdescribe 2016-05-16 14:40:04 -04:00
Isaac Connor 0faa28d058 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-16 14:38:49 -04:00
Isaac Connor 6084e2d00f improve error message. The unrecognized action error happens above, so this error should just mention permissions 2016-05-16 14:38:40 -04:00
Andrew Bauer 46039a1887 Merge pull request #1472 from ZoneMinder/v4l1_compat
V4l1 compat
2016-05-16 13:02:27 -05:00
Andrew Bauer b3d261e8d9 Merge pull request #1476 from connortechnology/whitespace
whitespace/google code style
2016-05-16 12:59:24 -05:00
Andrew Bauer b3c6382e6c Merge pull request #1484 from ZoneMinder/update_zmupdate
Update zmupdate
2016-05-16 09:55:00 -05:00
Isaac Connor df8964c1f9 use eid= & fid= instead of path to frame image. The use of view=image also provides more security. 2016-05-16 10:33:21 -04:00
Isaac Connor 235095ed5f fix URL to image view 2016-05-16 10:32:43 -04:00
Isaac Connor b53a0a564d Don't need the extra use ZoneMinder::Config 2016-05-16 10:07:24 -04:00
Isaac Connor dd24c35afa revert bogus optimisation 2016-05-16 10:05:12 -04:00
Isaac Connor 3780f8a2e6 move functions from ConfigAdmin into Config. I see no reason for them to be in a separate module 2016-05-16 09:31:54 -04:00
Isaac Connor 5df85770cd zmupdate.pl.in 2016-05-13 13:52:34 -04:00
Isaac Connor 8cb2692bbb pass in the server url into the monitor object to use instead of the portal url 2016-05-13 11:09:12 -04:00
Isaac Connor ed3e975e5a take fid and eid as alternate parameters 2016-05-12 11:55:48 -04:00
Isaac Connor 1530096560 whitespace/google code style 2016-05-12 10:17:41 -04:00
Isaac Connor 4cd510c438 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-12 09:31:02 -04:00
Isaac Connor 9377dca44f Merge pull request #1474 from pliablepixels/api-alarm-getstate
added status command to retrieve alarmed status of monitor in additio…
2016-05-10 23:48:32 -04:00
arjunrc b513bcef82 icon's gonna kill me 2016-05-10 20:09:41 -04:00
arjunrc af3cae578e fixed verbose handling bug for status command on zmu 2016-05-10 20:07:28 -04:00
arjunrc 8d5f2a8e5d added iconnor's change back 2016-05-10 19:17:09 -04:00
arjunrc df830a5190 resolved merge conflicts 2016-05-10 19:15:00 -04:00
arjunrc 2888142e68 added status command to retrieve alarmed status of monitor in addition to on/of 2016-05-10 16:55:43 -04:00
Isaac Connor e804cfbc16 Merge pull request #1 from josh4trunks/patch-1
Support user defined MySQL Port/Socket in API
2016-05-10 14:13:51 -04:00
Isaac Connor a5ba4759bf fix new config entry 2016-05-10 10:54:40 -04:00
Isaac Connor 17f4f5789e Merge branch 'master' into v4l1_compat 2016-05-10 10:10:48 -04:00
Isaac Connor aebfa5c237 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-05-10 10:02:59 -04:00
Isaac Connor 4d20d35f8d add back missing depends for perl modules which are needed both for building and installing 2016-05-10 08:43:38 -04:00
Steve Gilvarry c0d3d69bec Merge pull request #1420 from connortechnology/fix_event_menubars
remove set height on the menu bars, fixing flow issues
2016-05-10 16:55:06 +10:00
Isaac Connor 5566d1881d add perl dbd mysql to build depends. Seems to need it. 2016-05-09 21:34:12 -04:00
Steve Gilvarry fa91c50046 Merge pull request #1458 from ZoneMinder/merge_db_connects
Merge db connects
2016-05-10 08:02:02 +10:00
Steve Gilvarry b03d2660cb Merge pull request #1455 from ZoneMinder/api_servers
rough in Server object support
2016-05-10 08:00:58 +10:00
Steve Gilvarry 413eced6df Merge pull request #1450 from ZoneMinder/bind_fixes
add some error checking, but fix the call to bind
2016-05-10 08:00:10 +10:00
Steve Gilvarry cffcbc6357 Merge pull request #1462 from ZoneMinder/merge_storageareas
Merge object model classes from storageareas
2016-05-10 07:59:25 +10:00
Isaac Connor 605edfd6d0 add ENV{LD_PRELOAD} setting 2016-05-09 12:46:26 -04:00
Isaac Connor 08bf97fe85 Add a config entry for ZM_LD_PRELOAD 2016-05-09 12:44:41 -04:00
Isaac Connor 41776547cb Merge branch 'master' into fix_zone_edit 2016-05-09 12:33:05 -04:00
Isaac Connor b33e35bda7 move the require to the top 2016-05-09 12:14:59 -04:00
Isaac Connor 3522c5796b add BEGIN Back to ZoneMinder.pm 2016-05-09 12:01:26 -04:00