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/198b5933 Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/198b5933 Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/198b5933 Branch: refs/heads/griffin-0.2.0-incubating-rc1 Commit: 198b59339ef9163f66527fbd430a7c211d2140d7 Parents: 8fbd024 fb569ad Author: Lionel Liu <[email protected]> Authored: Tue Jan 30 10:35:20 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Tue Jan 30 10:35:20 2018 +0800 ---------------------------------------------------------------------- .../measure/create-measure/ac/ac.component.html | 16 ++++++++++++++++ .../app/measure/create-measure/ac/ac.component.ts | 11 +++++++++++ .../configuration/configuration.component.css | 10 +++++++++- .../configuration/configuration.component.html | 13 +++++++++++++ .../configuration/configuration.component.ts | 13 +++++++++++++ .../measure/create-measure/pr/pr.component.html | 18 +++++++++++++----- .../app/measure/create-measure/pr/pr.component.ts | 5 +++++ .../measure-detail/measure-detail.component.html | 16 ++++++++++++++++ .../measure-detail/measure-detail.component.ts | 6 +++++- 9 files changed, 101 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
