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

14036 Commits

Author SHA1 Message Date
Isaac Connor 17a7d02275 fix reversal of in_frame/out_frame in VideoStore destructor 2019-10-18 10:16:18 -04:00
Isaac Connor 60ec545683 fix compile warning due to snprintf into a too small char array 2019-10-18 09:43:25 -04:00
Isaac Connor 0f1b186eb1 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-10-18 09:29:42 -04:00
Isaac Connor a0f021ee12 Handle the case of flushing resampler by sending NULL 2019-10-17 17:37:36 -04:00
Isaac Connor c6adf46384 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-17 16:35:34 -04:00
Isaac Connor 0e6e572e45 add libdatetime-perl to depends. Is used in control modules 2019-10-17 16:35:23 -04:00
Isaac Connor 1abdf25ad3
Merge pull request #2727 from externo6/align_filter_options 
align with other filter options
 2019-10-17 10:22:01 -04:00
externo6 9068cb1a19 align with other filter options 2019-10-17 10:17:22 +01:00
Isaac Connor fdf48c4123
Merge pull request #2726 from externo6/more-filter-options 
More filter options
 2019-10-16 10:15:58 -04:00
Isaac Connor ebebcad10d Merge branch 'master' of github.com:zoneminder/ZoneMinder 2019-10-16 10:13:31 -04:00
Isaac Connor a3ea0c224e detaint cmd in runSysCmd. code style fixes. Return unknown for Longitude as well 2019-10-16 10:13:18 -04:00
Isaac Connor 7146bdd59a IN order to allow specifying a monitor Id that has been deleted, use monitor->Id instead of mid to test for monitor existence 2019-10-16 10:08:30 -04:00
Isaac Connor d145adf9c6 set default for V4LCapturePerFrame to 1 instead of null. 2019-10-16 10:07:50 -04:00
Isaac Connor fd480110d9 Make Isaac the upload/maintainer 2019-10-16 09:16:22 -04:00
Isaac Connor f938fd83ac keep track of video_next_dts. Use it when packet dts is AV_NOPTS_VALUE. Also handle EAGAIN in send_packet_get_frame etc 2019-10-16 09:01:59 -04:00
Isaac Connor d03de98317 remove carriage returns in ffmpeg log lines 2019-10-16 09:00:39 -04:00
Isaac Connor f25a823bc8 Fix event => zm_event 2019-10-16 08:53:40 -04:00
externo6 e232c22b3d Only add % to value if % is not present. 2019-10-16 10:10:23 +01:00
Isaac Connor b63fc0b0e5 Delete linkpath before deleting empty directories. add closedir and some more debugging. Also add popping off that last part of the dir at each loop 2019-10-15 20:44:15 -04:00
externo6 4b71bc75ea Change language to Contains / Not Contains and update perl filter. 2019-10-16 00:35:49 +01:00
Isaac Connor 04c22988ad Add code to delete empty event directories after deleting an event 2019-10-15 15:04:55 -04:00
Isaac Connor 382c0230bb Add jessie build 2019-10-15 15:04:32 -04:00
Isaac Connor 8ee567442e UPdate replay, scale, codec dropdown onchanges 2019-10-15 15:04:14 -04:00
Isaac Connor 3b31381a57 remove unneeded quotes. 2019-10-12 11:15:20 -04:00
Isaac Connor ee1e12b938 Be more robust about returning a Server object when instantiating the default Storage area. 2019-10-11 17:29:47 -04:00
Isaac Connor b93fe6bb04 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-10-11 14:05:15 -04:00
Isaac Connor 6f2a98197e Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-11 14:05:02 -04:00
Isaac Connor 90d6e11fb9 If we try to write a packet with dts == AV_NOPTS_VALUE, set it to stream->cur_dts. This might at least give us a playable file. 2019-10-11 14:04:51 -04:00
Isaac Connor 3b586a2abe include stream index and packet queue size in debug message 2019-10-11 13:53:18 -04:00
Isaac Connor 7f6e3d7e53
Merge pull request #2722 from ZoneMinder/pliablepixels-patch-1 
Fix ZM slack join link
 2019-10-11 11:52:31 -04:00
Pliable Pixels 1aaa52b994
Fix ZM slack join link 2019-10-11 10:53:50 -04:00
Isaac Connor 144766ea46 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-10-11 09:21:16 -04:00
Isaac Connor 70396c5897 Don't warn about the spaces in the command 2019-10-09 13:10:43 -04:00
Isaac Connor 29a8cd3c91 use rsync instead of sftp 2019-10-09 13:00:29 -04:00
Isaac Connor c7f5673b47 Make filterFIelds global and give more info in error message 2019-10-09 10:30:40 -04:00
Isaac Connor b15f7ad47d handle ipv6 in Server->Hostname. Fixes #2713 2019-10-09 10:00:13 -04:00
Isaac Connor a94748f094 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-10-08 18:49:51 -04:00
Isaac Connor 1cf034ec5f fix inline js on the back/close button 2019-10-08 18:49:29 -04:00
Isaac Connor d1b086ddc6 fix cases of monitor->CanZoom to control->CanZoom 2019-10-08 18:49:11 -04:00
Isaac Connor c15e8eebb2 Make PTZ presets fill the entire window width and fix other visual problems with the buttons 2019-10-08 18:48:37 -04:00
Isaac Connor f3f972359b increase width of Zoom, White, Iris controls to fit wider button 2019-10-08 18:28:02 -04:00
Isaac Connor 4126554092 Move sendControlCommand out of includes/control_functions.php into Monitor.php. Make it smarted about talking to zmcontrol.pl. Fix sending the quit command 2019-10-08 18:07:33 -04:00
Isaac Connor 55b1d29927 better error messages when no command is given to zmcontrol 2019-10-08 18:06:52 -04:00
Isaac Connor af6ead60a5 Add USE_SFTP option to rsync_xfer to just use sftp install of sshfs to copy files over to zmrepo 2019-10-08 12:31:01 -04:00
Isaac Connor 3db9375af2
Merge pull request #2721 from arushipandit/arushi-master 
Update ISSUE_TEMPLATE.md
 2019-10-06 17:57:52 -04:00
arushipandit 444580a61f Update ISSUE_TEMPLATE.md 2019-10-06 19:55:56 +05:30
Isaac Connor 307b3f33d6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-05 16:56:13 -04:00
Isaac Connor 5040d5b075 remove extra ( 2019-10-05 16:56:05 -04:00
Isaac Connor dc191d3833 Use my docker for trusty and xenial 2019-10-05 16:55:00 -04:00
Isaac Connor b79ff07edb
Merge pull request #2719 from Simpler1/2718-remove-IPCC7210W-dash 
Remove dash from IPCC7210W.pm
 2019-10-05 10:33:26 -04:00