Commit Graph

14169 Commits

Author SHA1 Message Date
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
Simpler1 436c46207f Remove dash from IPCC7210W.pm 2019-10-04 22:52:51 -04:00
Isaac Connor 842caf731c Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2019-10-03 21:09:15 -04:00
Isaac Connor 5aa639ff76 use common printMsg 2019-10-03 18:11:54 -04:00
Isaac Connor 5799815c2e Better debugging 2019-10-03 18:09:15 -04:00
Isaac Connor 0515fe51fd debug 2019-10-03 17:59:34 -04:00
Isaac Connor 12f75c32de Fix version 2019-10-03 17:54:41 -04:00
Isaac Connor 5f702c1905 WHen instantiating the client, can't get services because we havn't set credentials yet 2019-10-03 17:36:57 -04:00
Isaac Connor 783358c932 Import Sony PTZ driver 2019-10-03 17:31:54 -04:00
Isaac Connor b1496643eb fix js error in onvif probe 2019-10-03 17:31:10 -04:00
Isaac Connor 5384b9345a fix errors on centos 7 with the functions view 2019-10-03 17:30:52 -04:00
Isaac Connor 11fe748154 Sort control capabilities by Name instead of Id 2019-10-03 17:30:31 -04:00
Isaac Connor 7328eb1979 be more robust when sending commands to zmcontrol. Of no commands given don't bother. 2019-10-03 17:30:10 -04:00
Isaac Connor 88ca9816fe handle a profile not being a videoEncoder 2019-10-03 17:29:33 -04:00
Isaac Connor 6f5c297265 google code style 2019-10-03 17:28:57 -04:00
Isaac Connor c62eff48a7 Turn off debugging that prevents results processing 2019-10-03 17:28:44 -04:00
Isaac Connor a7f27dddde quotes and more useful sendCmd debugging. 2019-10-03 17:27:46 -04:00
Isaac Connor 714ce0ba60 Add coller info to AUTOLOAD error message when PTZ function isn't defined. Provide parent printMsg function. 2019-10-03 17:27:16 -04:00