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

Branch: refs/heads/griffin-0.2.0-incubating-rc2
Commit: 5f71eee0c3f51baba3eb90b635b16611066c75e7
Parents: 198b593 e703471
Author: Lionel Liu <bhlx3l...@163.com>
Authored: Wed Jan 31 16:32:46 2018 +0800
Committer: Lionel Liu <bhlx3l...@163.com>
Committed: Wed Jan 31 16:32:46 2018 +0800

----------------------------------------------------------------------
 ui/angular/src/app/app.component.css            | 167 ++--
 ui/angular/src/app/app.component.html           |   2 +-
 ui/angular/src/app/app.component.ts             |  84 +-
 ui/angular/src/app/app.module.ts                |   1 -
 .../src/app/dataasset/dataasset.component.css   |  26 +-
 .../src/app/dataasset/dataasset.component.ts    |  17 -
 ui/angular/src/app/health/health.component.ts   | 264 ++++---
 .../app/job/create-job/create-job.component.css |  52 +-
 .../job/create-job/create-job.component.html    |   3 +-
 .../app/job/create-job/create-job.component.ts  | 307 ++++----
 ui/angular/src/app/job/job.component.css        |  42 +-
 ui/angular/src/app/job/job.component.html       |  37 +-
 ui/angular/src/app/job/job.component.ts         | 179 ++---
 ui/angular/src/app/login/login.component.css    |  87 ++-
 ui/angular/src/app/login/login.component.ts     | 133 ++--
 .../measure/create-measure/ac/ac.component.css  | 105 +--
 .../measure/create-measure/ac/ac.component.html | 116 +--
 .../measure/create-measure/ac/ac.component.ts   | 770 ++++++++++---------
 .../configuration/configuration.component.css   |   8 -
 .../configuration/configuration.component.html  |  13 +-
 .../configuration/configuration.component.ts    | 124 +--
 .../create-measure/create-measure.component.css | 109 +--
 .../create-measure/create-measure.component.ts  |  51 +-
 .../measure/create-measure/pr/pr.component.css  | 166 ++--
 .../measure/create-measure/pr/pr.component.html |  89 +--
 .../measure/create-measure/pr/pr.component.ts   | 706 +++++++++--------
 .../create-measure/pr/rule/rule.component.css   |  44 +-
 .../create-measure/pr/rule/rule.component.ts    |   1 -
 .../measure-detail.component.html               |  10 +-
 .../measure-detail/measure-detail.component.ts  |  99 +--
 .../src/app/measure/measure.component.css       | 351 ++++-----
 .../src/app/measure/measure.component.html      |  16 +-
 ui/angular/src/app/measure/measure.component.ts | 116 +--
 .../detail-metric/detail-metric.component.ts    | 126 +--
 ui/angular/src/app/metric/metric.component.css  |  65 +-
 ui/angular/src/app/metric/metric.component.html |   7 -
 ui/angular/src/app/metric/metric.component.ts   | 153 ++--
 ui/angular/src/app/service/chart.service.ts     | 456 +++++------
 ui/angular/src/app/service/service.service.ts   | 188 +++--
 ui/angular/src/app/service/user.service.ts      |  32 +-
 .../src/app/sidebar/sidebar.component.css       | 266 +++----
 .../src/app/sidebar/sidebar.component.html      |   3 +-
 ui/angular/src/app/sidebar/sidebar.component.ts | 154 ++--
 ui/angular/src/app/sidebar/truncate.pipe.ts     |   2 -
 ui/angular/src/styles.css                       |   4 +-
 45 files changed, 2881 insertions(+), 2870 deletions(-)
----------------------------------------------------------------------


Reply via email to