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

6896 Commits

Author SHA1 Message Date
Isaac Connor 0044161b9c Merge branch 'fix_zone_edit' into storageareas 2016-04-29 10:46:37 -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
Isaac Connor 819dad455e whitespace/tabs 2016-04-29 09:11:14 -04:00
Isaac Connor b41a3b1b25 fix tabs/shiftwidth 2016-04-29 09:01:28 -04:00
Isaac Connor 5eebc50bfb tabs to spaces 2016-04-29 08:57:31 -04:00
Isaac Connor 728bffa6a0 Check and set audio to mono 2016-04-29 08:52:25 -04:00
Isaac Connor af66105c37 Merge branch 'master' into storageareas 2016-04-29 08:28:53 -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 097e7f3906 Merge branch 'master' into storageareas 2016-04-28 16:40:44 -04: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 d06a0cf2a4 2016042801 build 2016-04-28 12:58:09 -04:00
Isaac Connor 30b3fa8a8b add a cast to help the compile figure out which function to use 2016-04-28 12:57:38 -04:00
Isaac Connor 1096461793 Need a cast to handle old avformat 2016-04-28 12:57:14 -04:00
Isaac Connor 1282e36bb2 av_get_media_type_string is not available in trusty 2016-04-28 12:56:40 -04:00
Isaac Connor 337d8a748c simplify the separator stuff 2016-04-28 12:56:19 -04:00
Isaac Connor a141064aad Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-28 11:34:49 -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 59406fd03a Merge branch 'master' into storageareas 2016-04-28 09:24:36 -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
Steve Gilvarry d9fd0faa32 Merge pull request #1447 from ZoneMinder/simplify_zm_signal 
Simplify zm signal
 2016-04-28 21:37:55 +10:00
Isaac Connor 386afc3546 Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-04-26 20:02:04 -04:00
Isaac Connor 69d5065ebf move ip down as well 2016-04-26 16:05:37 -04:00
Isaac Connor 5d88acb8a6 re-arrange a few lines to remove some duplicate ifdef's. And move the cr2 def into the area that uses it to remove build warnings on freebsd 2016-04-26 16:03:26 -04:00
Isaac Connor 7d7249f328 use std::string instead of C strings. Mostly this will quiet build warnings on FreeBSD and removes the potential for buffer overflows 2016-04-26 15:48:21 -04:00
Isaac Connor ff3e9c85d9 Merge pull request #1445 from abishai/master 
unbreak build under FreeBSD 32 bit II
 2016-04-26 15:09:22 -04:00
Isaac Connor 010f748016 fix clone merge 2016-04-26 15:02:34 -04:00
abi 9aff84fbbb unbreak build under FreeBSD 32 bit II 2016-04-26 21:53:50 +03:00
Isaac Connor d847d66e99 handle disk_free_space error 2016-04-26 14:40:40 -04:00
Isaac Connor 0adbaafd98 Merge branch 'master' into storageareas 2016-04-26 13:10:37 -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 50f846969a Merge branch 'fix_rotate' into storageareas 2016-04-25 20:00:25 -04:00
Isaac Connor 2d8c484792 rotate dimensions when instantiating the Monitor object 2016-04-25 16:48:26 -04:00
Isaac Connor d936312207 revert 2016-04-25 16:46:23 -04:00
Isaac Connor 8c53925fdc redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions. 2016-04-25 16:00:34 -04:00
Isaac Connor 851e8f46ff redo fix_rotate 2016-04-25 15:57:39 -04:00
Isaac Connor 59db5d42e7 include Frame.php 2016-04-25 15:00:27 -04:00
Isaac Connor b50172fc2e introduce a Frame object. Alter the image view to take just an fid, in which case it is the unique primary key Id of the Frame. 2016-04-25 14:59:55 -04: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
Isaac Connor 26a45d5fa9 Don't rotate dimensions when constructing the monitor because they are already rotated 2016-04-25 13:55:28 -04:00
Steve Gilvarry 4ca61b7bd8 Removed 180 lines of commented out code that has been hanging around 
in here for a long time.
 2016-04-25 22:12:49 +10:00