pliablepixels
|
823c733ce9
|
initial OSX port - baby steps - compile & make only
|
2016-05-16 16:14:02 -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
|
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
|
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
|
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
|
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 |
Isaac Connor
|
7ea8b76c03
|
Merge branch 'master' into merge_db_connects
|
2016-05-09 10:39:43 -04:00 |
Isaac Connor
|
6504c2ac53
|
Merge pull request #1453 from SteveGilvarry/Ubuntu1604
Ubuntu 1604 Packaging folder
|
2016-05-09 10:38:28 -04:00 |
Isaac Connor
|
966a9dcd8d
|
Merge pull request #1467 from ZoneMinder/api_fixes
Don't pass request data as a monitor array to daemonControl
|
2016-05-07 18:25:35 -04:00 |
Isaac Connor
|
e35b0a1eb2
|
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
added alarmed frames filter
|
2016-05-07 17:06:37 -04:00 |
arjunrc
|
be329e1e0d
|
switched to named param format, more flexible, in line with other APIs
|
2016-05-07 16:28:25 -04:00 |
arjunrc
|
8347b69b09
|
added alarmed frames filter
|
2016-05-07 14:26:09 -04:00 |
Isaac Connor
|
6d991a1c6c
|
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
added alarm enable/disable
|
2016-05-07 11:26:49 -04:00 |
arjunrc
|
6f9cc0f19f
|
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
|
2016-05-07 11:01:03 -04:00 |
Isaac Connor
|
15977f1a3c
|
Don't pass request data as a monitor array to daemonControl
|
2016-05-07 10:56:38 -04:00 |
arjunrc
|
0280ae4dd5
|
added alarm enable/disable
|
2016-05-07 10:37:42 -04:00 |
Isaac Connor
|
b444c8a6b4
|
Move the BEGIN from ZoneMinder to ZoneMinder/Base.
|
2016-05-07 09:34:45 -04:00 |
Isaac Connor
|
6e32b5d266
|
Use fully specified COnfig hash to simplify Symbol tables
|
2016-05-07 09:34:04 -04:00 |
Isaac Connor
|
f55f979cc9
|
use fully specified Config to simplify symbol tables
|
2016-05-07 09:30:03 -04:00 |
Isaac Connor
|
0bf54fc266
|
Merge branch 'schrorg-RTSP-IPv6'
|
2016-05-06 08:32:39 -04:00 |
Isaac Connor
|
fd896acd50
|
Merge branch 'RTSP-IPv6' of https://github.com/schrorg/ZoneMinder into schrorg-RTSP-IPv6
|
2016-05-06 08:32:21 -04:00 |
Isaac Connor
|
c050969141
|
Merge object model classes from storageareas
|
2016-05-05 15:33:28 -04:00 |
Isaac Connor
|
e101aed2d5
|
Remove IGNORE keyword, it is invalid
|
2016-05-05 15:10:30 -04:00 |
Isaac Connor
|
24bf91707f
|
Database module should really use DBI
|
2016-05-03 10:22:38 -04:00 |