Merge branch 'apache-master' into tmst
Project: http://git-wip-us.apache.org/repos/asf/incubator-griffin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-griffin/commit/b857bc0a Tree: http://git-wip-us.apache.org/repos/asf/incubator-griffin/tree/b857bc0a Diff: http://git-wip-us.apache.org/repos/asf/incubator-griffin/diff/b857bc0a Branch: refs/heads/griffin-0.2.0-incubating-rc4 Commit: b857bc0ac6289f237f996397be872149394db613 Parents: b9411cb 618f974 Author: Lionel Liu <[email protected]> Authored: Mon Apr 9 15:39:38 2018 +0800 Committer: Lionel Liu <[email protected]> Committed: Mon Apr 9 15:39:38 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(-) ----------------------------------------------------------------------
