Merge branch 'master' of github.com:MPR-Global/metadata into apache-local
Conflicts:
dashboard/v2/public/modules/details/detailsResource.js
dashboard/v2/public/modules/lineage/lineageResource.js
dashboard/v2/public/modules/search/searchResource.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/ee049a60
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/ee049a60
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/ee049a60
Branch: refs/heads/apache-local
Commit: ee049a606c3778198a785e065d9ca3fbd91c753e
Parents: 054dfb7 24eb03b
Author: Venkatesh Seetharam <[email protected]>
Authored: Fri Jun 12 11:57:15 2015 -0700
Committer: Venkatesh Seetharam <[email protected]>
Committed: Fri Jun 12 11:57:15 2015 -0700
----------------------------------------------------------------------
dashboard/v1/css/bootstrap-responsive.css | 18 ++
dashboard/v1/css/bootstrap-responsive.min.css | 18 ++
dashboard/v1/css/bootstrap-theme.css | 18 ++
dashboard/v1/css/bootstrap-theme.css.map | 18 ++
dashboard/v1/css/bootstrap-theme.min.css | 18 ++
dashboard/v1/css/bootstrap.css | 18 ++
dashboard/v1/css/bootstrap.min.css | 18 ++
dashboard/v1/css/heroic-features.css | 18 ++
dashboard/v1/css/sticky-footer-navbar.css | 18 ++
.../v1/fonts/glyphicons-halflings-regular.svg | 18 ++
dashboard/v1/js/attributes.html | 18 ++
dashboard/v1/js/bootstrap.js | 18 ++
dashboard/v1/js/bootstrap.min.js | 18 ++
dashboard/v1/js/jquery.js | 18 ++
dashboard/v1/js/npm.js | 18 ++
dashboard/v1/lib/Angular/angular-route.min.js | 18 ++
.../v1/lib/Angular/angular-route.min.js.map | 18 ++
dashboard/v1/lib/Angular/angular.min.js | 18 ++
dashboard/v1/lib/Angular/angular.min.js.map | 18 ++
dashboard/v2/.bowerrc | 2 +-
dashboard/v2/.gitignore | 5 +-
dashboard/v2/.jshintignore | 18 ++
dashboard/v2/.jshintrc | 18 ++
dashboard/v2/README.md | 24 +-
dashboard/v2/bower.json | 1 +
dashboard/v2/gruntfile.js | 109 ++++---
dashboard/v2/package.json | 9 +-
dashboard/v2/public/css/common.css | 46 ++-
dashboard/v2/public/css/details.css | 21 ++
dashboard/v2/public/css/lineage.css | 53 +++-
.../v2/public/css/sticky-footer-navbar.css | 23 ++
dashboard/v2/public/img/ApacheAtlasLogo.png | Bin 0 -> 3115 bytes
dashboard/v2/public/img/favicon.ico | Bin 2462 -> 3638 bytes
dashboard/v2/public/img/process.png | Bin
dashboard/v2/public/img/spinner.gif | Bin 0 -> 8275 bytes
dashboard/v2/public/img/tableicon.png | Bin 0 -> 478 bytes
dashboard/v2/public/index.html | 71 +++++
dashboard/v2/public/js/app.js | 9 +-
dashboard/v2/public/js/routes.js | 2 +-
.../public/modules/details/detailsController.js | 26 +-
.../v2/public/modules/details/detailsModule.js | 0
.../public/modules/details/detailsResource.js | 3 +-
.../v2/public/modules/details/detailsRoutes.js | 0
.../public/modules/details/views/attribute.html | 13 +-
.../public/modules/details/views/details.html | 38 ++-
.../v2/public/modules/details/views/schema.html | 52 ++++
dashboard/v2/public/modules/home/homeModule.js | 2 +-
dashboard/v2/public/modules/home/homeRoutes.js | 31 --
dashboard/v2/public/modules/home/img/splash.png | Bin 157503 -> 275202 bytes
.../v2/public/modules/home/views/header.html | 4 +-
.../public/modules/lineage/lineageController.js | 312 ++++++++++---------
.../public/modules/lineage/lineageResource.js | 5 +-
.../public/modules/lineage/views/lineage.html | 8 +-
.../modules/navigation/navigationController.js | 31 ++
.../modules/navigation/navigationModule.js | 21 ++
.../modules/navigation/navigationResource.js | 36 +++
.../modules/navigation/views/navigation.html | 24 ++
.../public/modules/search/searchController.js | 95 +++++-
.../v2/public/modules/search/searchDirective.js | 34 ++
.../v2/public/modules/search/searchResource.js | 10 +-
.../v2/public/modules/search/searchRoutes.js | 9 +-
.../v2/public/modules/search/views/search.html | 69 ++--
.../modules/search/views/searchResult.html | 32 +-
.../modules/search/views/types/column.html | 21 ++
.../public/modules/search/views/types/db.html | 22 ++
.../public/modules/search/views/types/guid.html | 4 +-
.../modules/search/views/types/loadprocess.html | 22 ++
.../modules/search/views/types/storagedesc.html | 21 ++
.../modules/search/views/types/table.html | 22 ++
.../public/modules/search/views/types/view.html | Bin 0 -> 1242 bytes
dashboard/v2/public/views/includes/foot.html | 37 ---
dashboard/v2/public/views/includes/head.html | 46 ---
dashboard/v2/public/views/index.html | 39 ---
dashboard/v2/server.js | 18 ++
dashboard/v2/server/config/config.js | 48 ---
dashboard/v2/server/config/express.js | 146 ---------
dashboard/v2/server/routes/system/homeRoute.js | 29 --
dashboard/v3/css/bootstrap-responsive.css | 18 ++
dashboard/v3/css/bootstrap-responsive.min.css | 18 ++
dashboard/v3/css/bootstrap-theme.css | 18 ++
dashboard/v3/css/bootstrap-theme.css.map | 19 ++
dashboard/v3/css/bootstrap-theme.min.css | 18 ++
dashboard/v3/css/bootstrap.css | 18 ++
dashboard/v3/css/bootstrap.min.css | 18 ++
dashboard/v3/css/heroic-features.css | 18 ++
dashboard/v3/css/pagination.css | 18 ++
dashboard/v3/css/sticky-footer-navbar.css | 18 ++
dashboard/v3/css/style.css | 18 ++
.../v3/fonts/glyphicons-halflings-regular.svg | 18 ++
dashboard/v3/js/config.json | 18 ++
dashboard/v3/lib/angular-route.min.js.map | 18 ++
dashboard/v3/lib/angular-ui-router.min.js | 18 ++
dashboard/v3/lib/angular.js | 18 ++
dashboard/v3/lib/angular.min.js | 18 ++
dashboard/v3/lib/angular.min.js.map | 18 ++
dashboard/v3/lib/bootstrap.js | 18 ++
dashboard/v3/lib/bootstrap.min.js | 18 ++
dashboard/v3/lib/d3.tip.v0.6.3.js | 18 ++
dashboard/v3/lib/ie-emulation-modes-warning.js | 18 ++
.../v3/lib/ie10-viewport-bug-workaround.js | 18 ++
dashboard/v3/lib/jquery.js | 18 ++
dashboard/v3/lib/npm.js | 18 ++
webapp/pom.xml | 45 ++-
103 files changed, 1911 insertions(+), 668 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/ee049a60/webapp/pom.xml
----------------------------------------------------------------------
