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/92c9f657 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/92c9f657 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/92c9f657 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 92c9f657687ae03ededf2bfbdf3d74bc1ac39647 Parents: 8803a6c 2972aa2 Author: Lionel Liu <bhlx3l...@163.com> Authored: Fri Jan 26 14:24:43 2018 +0800 Committer: Lionel Liu <bhlx3l...@163.com> Committed: Fri Jan 26 14:24:43 2018 +0800 ---------------------------------------------------------------------- .../job/create-job/create-job.component.html | 73 +------- .../app/job/create-job/create-job.component.ts | 187 ++----------------- .../measure/create-measure/ac/ac.component.html | 164 ++++++++++------ .../measure/create-measure/ac/ac.component.ts | 32 ++-- .../measure/create-measure/pr/pr.component.html | 88 +++++---- .../measure/create-measure/pr/pr.component.ts | 57 +++--- .../measure-detail.component.html | 54 +++++- .../measure-detail/measure-detail.component.ts | 59 ++++-- .../src/app/measure/measure.component.html | 6 +- ui/angular/src/app/service/service.service.ts | 4 +- 10 files changed, 330 insertions(+), 394 deletions(-) ----------------------------------------------------------------------
