ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,034 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

6034 Commits

Author SHA1 Message Date
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
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
Joshua Ruehlig e12160456b Support user defined MySQL Port/Socket in API 2016-05-09 00:24:08 -07: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
Isaac Connor e80db4c433 Use zmDbConnect instead of duplicated db connect code 2016-05-03 10:22:16 -04:00
Isaac Connor 49e3d3be7a Turn the config loading code from a BEGIN to a function that could be called repeatedly. 2016-05-03 10:21:50 -04:00
Isaac Connor 9406a2337f Add a BEGIN section to load things in the correct order. 2016-05-03 10:21:01 -04:00
Isaac Connor 30f34a6f49 instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:59:40 -04:00
Isaac Connor 55d58a140e instead of code duplication for opening the db, use zmDbConnect everywhere 2016-05-03 08:57:51 -04:00
Isaac Connor 01aa2c9319 change permissions to stream permissions for view 2016-05-02 19:48:24 -04:00
Isaac Connor 5321fe35bd Merge pull request #1321 from SteveGilvarry/ffmpeg3_deprecation 
FFMPEG 3.0 deprecation fixes
 2016-05-02 12:44:16 -04:00
Isaac Connor 341ebc7b45 Merge branch 'master' into bind_fixes 2016-05-02 12:39:55 -04:00
Isaac Connor 75f9fde920 rough in Server object support 2016-05-02 10:41:25 -04:00
Steve Gilvarry 97a4cf0852 Add the changes...doh 2016-05-01 15:06:45 +10:00
Steve Gilvarry d7f7a0f074 Rename ubuntu1504, which is unsupported, to ubuntu 1604. Fix control file 
to current libav packages and php virtual packages. Update debian build
script to use new folder for any non-trusty build.
 2016-05-01 13:46:09 +10:00
Isaac Connor ce69f24bdd use zm.conf values for database connection 2016-04-30 08:11:39 -04:00
Isaac Connor 532fb77ecb As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes 2016-04-30 08:09:56 -04:00
Isaac Connor be5f0cd4a9 replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php 2016-04-29 10:44:46 -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
Steve Gilvarry e73935a15b Clean up extraneous avutil include 2016-04-29 21:29:07 +10:00
Steve Gilvarry 8452c4bce5 Fix tab to spaces merge issues 2016-04-29 21:27:28 +10:00
Steve Gilvarry 66a3fef61e Merge pull request #1384 from ZoneMinder/tabs_to_spaces 
tabs to spaces and use 2space indenting
 2016-04-29 19:27:12 +10:00
Isaac Connor 0dc2987b84 add some error checking, but fix the call to bind which really should have a +1 in it. 2016-04-28 16:32:50 -04:00
Isaac Connor c4410c512a Merge branch 'master' into fix_event_menubars 2016-04-28 09:35:58 -04:00
Isaac Connor fac07cba6d Merge branch 'master' into tabs_to_spaces 2016-04-28 09:31:40 -04:00
Isaac Connor 629f141734 Merge pull request #1441 from SteveGilvarry/remove_commented_code 
Delete large commented out code segment
 2016-04-28 09:30:43 -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
Isaac Connor 24e3306955 master master 2016-04-28 09:20:56 -04:00
Steve Gilvarry af361042ef Merge pull request #1446 from ZoneMinder/stdstring_instead_of_c_string 
use std::string instead of C strings. Mostly this will quiet build wa…
 2016-04-28 22:13:44 +10:00
Steve Gilvarry 6bf43631e2 Merge pull request #1428 from ZoneMinder/better_zmvideo 
Better zmvideo
 2016-04-28 22:00:52 +10:00
Steve Gilvarry 6549f7bf29 Merge pull request #1403 from ZoneMinder/fix_grant 
Fix grant
 2016-04-28 21:49:21 +10: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