Merge branch 'master' of https://github.com/apache/incubator-griffin into apache-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/995a4070 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/995a4070 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/995a4070 Branch: refs/heads/griffin-0.2.0-incubating-rc2 Commit: 995a407070bc917ff3edcef3cb2216c946d16041 Parents: 933ff30 459c966 Author: Lionel Liu <bhlx3l...@163.com> Authored: Mon Feb 5 13:03:26 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Mon Feb 5 13:03:26 2018 +0800 ---------------------------------------------------------------------- ui/angular/src/app/health/health.component.ts | 34 ++++---- ui/angular/src/app/job/job.component.ts | 1 + .../measure/create-measure/ac/ac.component.css | 2 +- .../measure/create-measure/ac/ac.component.html | 2 +- .../measure/create-measure/pr/pr.component.ts | 33 +++---- .../measure-detail.component.html | 6 +- .../measure-detail/measure-detail.component.ts | 16 ++-- .../detail-metric/detail-metric.component.css | 86 ++++++++++++++++++- .../detail-metric/detail-metric.component.html | 55 ++++++++++++ .../detail-metric/detail-metric.component.ts | 50 +++++++---- ui/angular/src/app/metric/metric.component.ts | 57 ++++++++---- ui/angular/src/app/service/chart.service.ts | 11 ++- ui/angular/src/app/sidebar/sidebar.component.ts | 34 ++++---- ui/angular/src/assets/img/table.png | Bin 0 -> 882 bytes 14 files changed, 289 insertions(+), 98 deletions(-) ----------------------------------------------------------------------
