Merge branch 'develop' into webpack

2018-11-04 17:54:55 +02:00
parent 7661b55920 e94d6ad6b2
commit ac090129aa
79 changed files with 818 additions and 255 deletions
@@ -2,7 +2,7 @@ import angular from 'angular';

 angular.module('portainer.docker').component('tasksDatatable', {
  templateUrl: './tasksDatatable.html',
-  controller: 'GenericDatatableController',
+  controller: 'TasksDatatableController',
  bindings: {
    titleText: '@',
    titleIcon: '@',