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

2129 Commits

Author SHA1 Message Date
Andrew Bauer a50c2bae35
Merge pull request #2289 from connortechnology/audio_only_with_ffmpeg 
Audio only with ffmpeg
 2018-11-03 20:39:18 -05:00
Isaac Connor 589b6f3eef add further note about needing h264 passthrough 2018-10-31 11:35:06 -04:00
Isaac Connor 69f7d36729 Make it clear that audio recording is only for ffmpeg input type 2018-10-31 11:34:30 -04:00
Andrew Bauer f790eacc92
Merge pull request #2273 from connortechnology/fix_rce 
use json_encode/decode instead of serialize/unserialize to pass onvif…
 2018-10-30 07:06:45 -05:00
Isaac Connor 95a6d0666a Improve behaviour and reduce extra logging when db goes away 2018-10-29 09:59:26 -04:00
Isaac Connor 2024df4393 use json_encode/decode instead of serialize/unserialize to pass onvif probe results around. Also clean up some code/ add some missing things. Fixes #2271 and #2272 2018-10-24 09:49:56 -04:00
Isaac Connor 86b0e4ea18 fix auth_hash. Should use generateAuthHash instead of accessing session directly 2018-10-22 18:32:39 -04:00
Isaac Connor ccd64b0fae Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-22 14:21:34 -04:00
Isaac Connor 7e4c54fec0 Use proper buttons and remove extra bootstrap styles from buttons so that they aren't all jammed together 2018-10-22 13:54:27 -04:00
Isaac Connor 559f34a838 User Monitor->Url() instead of Monitor->Server->Url() which will append port # 2018-10-20 14:33:09 -04:00
Isaac Connor 069f67a10f Break some long lines 2018-10-20 14:32:58 -04:00
Isaac Connor c9c46aa12d User Monitor->Url() instead of Monitor->Server->Url() which will append port # 2018-10-20 14:32:25 -04:00
Isaac Connor f5eca2da1e No longer need to add thisUrl to monitorUrl 2018-10-20 11:37:36 -04:00
Isaac Connor 3723f7acb3 comment out redundatn code increasing load on server 2018-10-19 15:02:10 -04:00
Isaac Connor 23fd5db5c8 fix #2265 extra graphics in url 2018-10-19 10:06:51 -04:00
Isaac Connor e7ec2faccd monitorUrl now includes /zm/index.php so adding thisUrl generates an incorrect url 2018-10-18 20:33:50 -04:00
Isaac Connor 37a48550e5 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-18 08:57:29 -04:00
Pliable Pixels f7de3a87e2 show event notes in same event view (#2259) 2018-10-16 12:11:25 -04:00
Isaac Connor 1b9b2811b3 remove ? from streamCmdParms. Mootools adds it in so this gives us a double ? 2018-10-16 11:39:16 -04:00
Isaac Connor d1bef49d0b Don't reload on a timeout when refreshing the navbar 2018-10-11 11:30:30 -04:00
Isaac Connor be78cb1b34 correct falsepi=> false 2018-10-10 16:08:48 -04:00
Andrew Bauer 4d5b0ca864
Merge pull request #2247 from connortechnology/turn_off_navbar 
Turn off navbar
 2018-10-10 13:21:46 -05:00
Isaac Connor bf3e783c42 remove link to zones_overview that I never got around to creating 2018-10-10 14:13:12 -04:00
Isaac Connor c58f043998 Add a mouseover tooltip saying Toggle Filters on up arrow 2018-10-10 14:12:16 -04:00
Isaac Connor 031c96c71d Merge branch 'master' into turn_off_navbar 2018-10-10 14:04:29 -04:00
Isaac Connor a46c9a8a7a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-10 14:03:35 -04:00
Isaac Connor 63a5211789 use url instead of server_url in Monitor object 2018-10-10 14:03:27 -04:00
Isaac Connor a1ab0855db if navbar=0 is given in the url, don't output the navbar 2018-10-10 14:02:46 -04:00
Isaac Connor 48e805c09f Make header flips perisisent based on cookie 2018-10-10 13:11:27 -04:00
Isaac Connor ff00f15b58 add missing ; 2018-10-09 11:10:09 -04:00
Isaac Connor 90ea6aa076 remove : from labels on monitor filters. They can be put back in css 2018-10-09 11:09:42 -04:00
Isaac Connor c9423aa902 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-10-01 10:40:20 -04:00
Isaac Connor 592f55a550 do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out. 2018-10-01 10:39:00 -04:00
Andrew Bauer 1978882825 dim x264 encode when on arm (#2227) 2018-10-01 09:17:22 -04:00
Isaac Connor c88dc690a6 Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order. 2018-09-28 13:24:50 -04:00
Isaac Connor c481fc868f be more robust when curFrames is empty. 2018-09-28 11:25:19 -04:00
Isaac Connor c5c01d56be fix unsetting fixed width/height/layout. Since they are actually controlled by cookies, the session will overwrite when we try to unset the cookie. Also fix some missing ;'s 2018-09-27 14:20:41 -04:00
Isaac Connor 7ffb46302f When events have the same starttime, sort secondly by Id 2018-09-26 14:10:49 -04:00
Isaac Connor c8c533ca2f Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-23 10:51:56 -04:00
Isaac Connor c5b23807a4 put back overlay.js for log view. 2018-09-23 10:51:46 -04:00
Andrew Bauer b8a2e71bb6
use base64_encode for monitor probe 
We need to employ the same method of encoding as the onvif probe to avoid fixing one while breaking the other
 2018-09-21 12:00:03 -05:00
Andy Bauer f53533e61e fix populating onvif probe data 2018-09-20 10:30:23 -05:00
Isaac Connor 6181e52c47 gracefully handle non-existence of imageFeed 2018-09-20 09:07:28 -04:00
Isaac Connor 8a5c989cac fix warning when editing users after a monitor has been deleted 2018-09-18 08:52:43 -04:00
Isaac Connor b5b71edbf6 Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80 2018-09-14 14:26:45 -04:00
Andrew Bauer c66dd25ebb implement collapsible headers (#2203) 2018-09-11 17:39:40 -04:00
Isaac Connor eef928a742 fix find_all => find 2018-09-11 14:31:03 -04:00
Isaac Connor 684f48979a Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-11 14:30:19 -04:00
Isaac Connor 8608fc97be fix trms=>terms 2018-09-10 15:11:57 -04:00
Isaac Connor 0ee261fae3 get rid of code that hid the close/back button on events if there was no history. 2018-09-10 15:11:41 -04:00