Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/8af7e91c Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/8af7e91c Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/8af7e91c Branch: refs/heads/develop Commit: 8af7e91ce175b048d7adf41d275daee5e16155a3 Parents: 8025e4c 93cd20a Author: Sebastian Schaffert <[email protected]> Authored: Mon Mar 17 15:30:57 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Mon Mar 17 15:30:57 2014 +0100 ---------------------------------------------------------------------- LICENSE.txt | 85 -- extras/webjars/pom.xml | 1 - extras/webjars/sgvizler/pom.xml | 88 -- .../webjars/sgvizler/src/main/resources/LICENSE | 16 - .../sgvizler/src/main/resources/REVISION | 1 - .../src/main/resources/lib/d3.v2.min.js | 4 - .../resources/lib/raphael-dracula.pack.min.js | 7 - .../src/main/resources/sgvizler.chart.css | 37 - .../sgvizler/src/main/resources/sgvizler.html | 114 -- .../sgvizler/src/main/resources/sgvizler.js | 1277 ------------------ .../src/main/resources/installer/LICENSE.txt | 60 +- parent/pom.xml | 13 +- platform/marmotta-sparql/pom.xml | 4 +- .../src/main/resources/kiwi-module.properties | 2 + .../main/resources/web/admin/configuration.js | 1 - .../src/main/resources/web/admin/sgvizler.html | 186 ++- 16 files changed, 109 insertions(+), 1787 deletions(-) ----------------------------------------------------------------------
