Commit Graph

13924 Commits

Author SHA1 Message Date
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 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
Isaac Connor 17611f2e4b Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-02 19:38:21 -04:00
Isaac Connor 769717b571
Merge pull request #2715 from connortechnology/fix_2620
Add delete from logs ajax capability.  Make the clear button use it. …
2019-10-02 16:43:08 -04:00
Isaac Connor 95615fee35 fix eslint 2019-10-02 16:42:50 -04:00
Isaac Connor 6b65e9a60c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-10-02 16:41:20 -04:00
Isaac Connor 7b93a445b8 Finish updating the linked Monitors dropdown 2019-10-02 15:42:56 -04:00
Isaac Connor e4b5052fb4 Add delete from logs ajax capability. Make the clear button use it. Fixes #2620 2019-10-02 15:39:04 -04:00
Isaac Connor b4d5d92d86 Add some non standard resolutions available on some vivotek cameras 2019-09-30 15:06:32 -04:00
Isaac Connor 09efbfb4f1 Sort groups 2019-09-30 15:02:05 -04:00
Isaac Connor e37870d983 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-30 14:43:02 -04:00
Isaac Connor 85b16e89b7 Fix groups dropdown 2019-09-30 14:42:10 -04:00
Andrew Bauer 2c22a4727f
Update rsync_xfer.sh 2019-09-30 10:39:29 -05:00
Andrew Bauer 9ba8f5c7ff
Update rsync_xfer.sh 2019-09-30 10:31:21 -05:00
Andrew Bauer 90b02beb94
fix eslint 2019-09-30 09:52:41 -05:00
Isaac Connor 3d6cab8360 Must force hash regeneration on login. Old hash may be from different user 2019-09-28 17:57:45 -04:00
Isaac Connor 7271151eb0 add some more aspect ratios 2019-09-28 15:16:25 -04:00
Isaac Connor 0c1635b3b8 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2019-09-28 14:23:33 -04:00
Isaac Connor 393f0a369c Revamp timeline. Make it handle being full browser width. remove onclicks. 2019-09-28 14:23:23 -04:00
Isaac Connor a2861c1361 remove errant ( 2019-09-28 14:22:40 -04:00
Isaac Connor ae7644370f quotes 2019-09-28 14:14:27 -04:00
Isaac Connor c24fc6c21f Set Delta to 0 to avoid errors 2019-09-28 14:10:11 -04:00
Isaac Connor deef948964 Allow anyone to change their skin 2019-09-28 12:58:17 -04:00
Isaac Connor ec9e94b99d Don't add checkboxes if can't edit groups 2019-09-28 12:58:01 -04:00
Isaac Connor 80e3922165 add backWindow function to handle back buttons 2019-09-28 12:57:43 -04:00
Isaac Connor 30b5612691 fix case of sql 2019-09-28 12:57:00 -04:00
Isaac Connor f3f253c083 Query was renamed to Query_json 2019-09-28 11:55:28 -04:00