You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@griffin.apache.org by li...@apache.org on 2018/04/26 08:12:31 UTC
[08/50] [abbrv] incubator-griffin git commit: Merge branch 'master'
of https://github.com/apache/incubator-griffin into apache-master
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/618f974f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/618f974f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/618f974f
Branch: refs/heads/griffin-0.2.0-incubating-rc4
Commit: 618f974f5e8d20a0939376f5fd0ac6555f846c91
Parents: 4f69b79 8633476
Author: Lionel Liu <bh...@163.com>
Authored: Mon Apr 9 15:39:27 2018 +0800
Committer: Lionel Liu <bh...@163.com>
Committed: Mon Apr 9 15:39:27 2018 +0800
----------------------------------------------------------------------
.gitignore | 2 +
ui/angular/src/app/app.component.html | 1 +
ui/angular/src/app/app.component.ts | 5 +-
ui/angular/src/app/app.module.ts | 18 +++++--
.../src/app/dataasset/dataasset.component.html | 8 ++--
.../src/app/dataasset/dataasset.component.ts | 2 +-
ui/angular/src/app/health/health.component.ts | 2 +-
.../app/job/create-job/create-job.component.ts | 3 +-
ui/angular/src/app/job/job.component.html | 4 +-
ui/angular/src/app/loader/loader.component.css | 24 ++++++++++
ui/angular/src/app/loader/loader.component.html | 21 ++++++++
.../src/app/loader/loader.component.spec.ts | 43 +++++++++++++++++
ui/angular/src/app/loader/loader.component.ts | 28 +++++++++++
.../src/app/loader/loader.service.spec.ts | 43 +++++++++++++++++
ui/angular/src/app/loader/loader.service.ts | 38 +++++++++++++++
ui/angular/src/app/loader/loader.state.ts | 21 ++++++++
ui/angular/src/app/login/login.component.ts | 2 +-
.../measure/create-measure/ac/ac.component.ts | 2 +-
.../create-measure/create-measure.component.ts | 2 +-
.../src/app/measure/measure.component.html | 4 +-
ui/angular/src/app/service/http.service.spec.ts | 33 +++++++++++++
ui/angular/src/app/service/http.service.ts | 50 ++++++++++++++++++++
ui/angular/src/app/service/service.service.ts | 4 +-
ui/angular/src/index.html | 4 +-
24 files changed, 342 insertions(+), 22 deletions(-)
----------------------------------------------------------------------