Andrew Bauer
|
bec14bf111
|
Merge pull request #1478 from ZoneMinder/fix_montage_server_refs
pass in the server url into the monitor object to use instead of the …
|
2016-05-23 20:14:35 -05:00 |
arjunrc
|
4018cab743
|
don't pass partial data to daemoncontrol
|
2016-05-19 14:53:16 -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 |
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
|
1530096560
|
whitespace/google code style
|
2016-05-12 10:17:41 -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 |
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 |
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
|
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
|
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
|
c050969141
|
Merge object model classes from storageareas
|
2016-05-05 15:33:28 -04:00 |
Isaac Connor
|
01aa2c9319
|
change permissions to stream permissions for view
|
2016-05-02 19:48:24 -04:00 |
Isaac Connor
|
75f9fde920
|
rough in Server object support
|
2016-05-02 10:41:25 -04:00 |
Steve Gilvarry
|
513d1568d0
|
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
handle disk_free_space error
|
2016-04-29 21:36:29 +10:00 |
Isaac Connor
|
c4410c512a
|
Merge branch 'master' into fix_event_menubars
|
2016-04-28 09:35:58 -04:00 |
Isaac Connor
|
5e20831030
|
Don't return of disk_free_space returns false, just log it.
|
2016-04-28 09:29:40 -04:00 |
Steve Gilvarry
|
ac5fdb8956
|
Merge pull request #1421 from connortechnology/fix_events_pagination
remove the if(pages>1) so that the if > line always happens
|
2016-04-28 21:43:54 +10:00 |
Isaac Connor
|
d847d66e99
|
handle disk_free_space error
|
2016-04-26 14:40:40 -04:00 |
Andrew Bauer
|
fe9cb4b7ec
|
Merge pull request #1442 from ZoneMinder/fix_rotate
Fix rotate
|
2016-04-26 09:54:01 -05:00 |
Isaac Connor
|
85798932ee
|
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
|
2016-04-25 14:10:26 -04:00 |
Andrew Bauer
|
81757a0465
|
Merge pull request #1418 from pliablepixels/1417-clone-monitor
Clone feature added
|
2016-04-20 13:02:10 -05:00 |
Isaac Connor
|
b2d02a64f4
|
reload stream after error
|
2016-04-19 12:02:58 -04:00 |
Isaac Connor
|
50f2747bb4
|
remove the if(pages>1) so that the if > line always happens
|
2016-04-15 16:11:53 -04:00 |
Isaac Connor
|
2b05815bfa
|
remove set height on the menu bars, fixing flow issues
|
2016-04-15 15:44:35 -04:00 |
arjunrc
|
804ac1de81
|
Clone feature added
|
2016-04-14 13:53:10 -04:00 |
Isaac Connor
|
851a81eff7
|
Merge pull request #1406 from ZoneMinder/svg_zones
replace the static zone image with a stream, and use SVG to draw the zones
|
2016-04-11 11:14:11 -04:00 |
Andrew Bauer
|
5542788a45
|
make cannot write to content dir an error, rather than fatal
|
2016-04-10 18:45:38 -05:00 |
Andy Bauer
|
39a30ff51b
|
refresh parent when cancel is clicked
|
2016-04-10 15:59:13 -05:00 |
Andy Bauer
|
e5bf2d245c
|
quit the stream in zones.php when zone.php is called
|
2016-04-10 15:33:55 -05:00 |
Andy Bauer
|
fbb2a527e6
|
remove setButtonState. it is not needed.
|
2016-04-10 07:55:45 -05:00 |
Andy Bauer
|
988d611d03
|
remove unused code
|
2016-04-09 21:37:00 -05:00 |
Andy Bauer
|
e7d35d16bc
|
add monitor alarm state and fps to zone edit view
|
2016-04-09 21:34:30 -05:00 |
Isaac Connor
|
c0c543e029
|
change quotes to prevent php7 complaint
|
2016-04-09 11:25:56 -04:00 |
Isaac Connor
|
0c8e0ac220
|
change quotes to prevent php7 complaint
|
2016-04-09 11:24:59 -04:00 |
Isaac Connor
|
feb7b36f11
|
use a local variable to prevent modifying the arguments
|
2016-04-09 11:23:52 -04:00 |
Isaac Connor
|
ce6f8da098
|
Use PDO::error_string instead of mysql_error
|
2016-04-09 11:23:35 -04:00 |
Isaac Connor
|
e90024c0d0
|
Better Error logging on disk_total_space failure
|
2016-04-09 09:27:12 -04:00 |
Isaac Connor
|
6d27a857aa
|
put a zones class on the svg
|
2016-04-08 14:38:50 -04:00 |