Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/marmotta into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/92205ec4 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/92205ec4 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/92205ec4 Branch: refs/heads/develop Commit: 92205ec473ba30548338f50942857e3bbbeb3b3a Parents: 01c33dc 593ea4f Author: Sebastian Schaffert <[email protected]> Authored: Tue Dec 17 15:46:58 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Dec 17 15:46:58 2013 +0100 ---------------------------------------------------------------------- .../core/api/triplestore/ContextService.java | 7 ++ .../triplestore/ContextServiceImpl.java | 21 +++++ .../triplestore/ContextWebService.java | 5 +- .../src/main/resources/web/admin/contexts.html | 90 ++++++++++++++------ .../src/main/resources/web/admin/ldpath.html | 13 +-- .../src/main/resources/web/admin/style.css | 12 ++- .../src/main/resources/web/admin/configure.html | 24 ++++-- .../resources/web/admin/widget/conf_reasoner.js | 56 ++++++++++-- 8 files changed, 177 insertions(+), 51 deletions(-) ----------------------------------------------------------------------
