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/d8b371de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/d8b371de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/d8b371de

Branch: refs/heads/griffin-0.2.0-incubating-rc1
Commit: d8b371de091b954c8cd0df6eaf8bcfedbc2ecf19
Parents: 712a5a7 a714b60
Author: Lionel Liu <bhlx3l...@163.com>
Authored: Tue Nov 28 12:49:28 2017 +0800
Committer: Lionel Liu <bhlx3l...@163.com>
Committed: Tue Nov 28 12:49:28 2017 +0800

----------------------------------------------------------------------
 ui/angular/src/app/app.component.html           | 111 ++--
 ui/angular/src/app/app.component.ts             |  16 +-
 .../src/app/dataasset/dataasset.component.html  | 153 +++--
 ui/angular/src/app/health/health.component.html |   5 +-
 ui/angular/src/app/health/health.component.ts   |  84 +--
 .../app/job/create-job/create-job.component.css |  12 +-
 .../job/create-job/create-job.component.html    |  78 +--
 .../app/job/create-job/create-job.component.ts  |  16 +-
 ui/angular/src/app/job/job.component.css        |   2 +-
 ui/angular/src/app/job/job.component.ts         |   2 -
 ui/angular/src/app/login/login.component.html   | 126 ++--
 ui/angular/src/app/login/login.component.ts     |   6 +-
 .../measure/create-measure/ac/ac.component.html | 609 +++++++++----------
 .../measure/create-measure/ac/ac.component.ts   | 157 ++---
 .../create-measure.component.html               | 199 +++---
 .../create-measure/create-measure.component.ts  |  16 +-
 .../measure/create-measure/pr/pr.component.html | 120 ++--
 .../measure/create-measure/pr/pr.component.ts   | 408 +++++--------
 .../create-measure/pr/rule/rule.component.css   |  20 +
 .../create-measure/pr/rule/rule.component.html  |   6 +-
 .../measure-detail.component.html               | 164 ++---
 .../measure-detail/measure-detail.component.ts  |  36 +-
 .../src/app/measure/measure.component.css       |   2 +-
 ui/angular/src/app/measure/measure.component.ts |  37 +-
 .../detail-metric/detail-metric.component.html  |  17 +-
 .../detail-metric/detail-metric.component.ts    |   2 +-
 ui/angular/src/app/metric/metric.component.css  |  30 +-
 ui/angular/src/app/metric/metric.component.html |  78 ++-
 ui/angular/src/app/metric/metric.component.ts   | 161 ++---
 .../src/app/sidebar/sidebar.component.css       |  16 +-
 .../src/app/sidebar/sidebar.component.html      | 109 ++--
 ui/angular/src/app/sidebar/sidebar.component.ts |  59 +-
 ui/angular/src/main.ts                          |   1 +
 ui/angular/src/styles.css                       |  32 +-
 ui/pom.xml                                      |   2 +-
 35 files changed, 1399 insertions(+), 1493 deletions(-)
----------------------------------------------------------------------


Reply via email to