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/6bcc9078 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/6bcc9078 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/6bcc9078 Branch: refs/heads/develop Commit: 6bcc9078c9a18d616cd554882c82c89001348376 Parents: 47a2b6f 003f526 Author: Sebastian Schaffert <[email protected]> Authored: Tue Feb 4 16:06:51 2014 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Tue Feb 4 16:06:51 2014 +0100 ---------------------------------------------------------------------- .../marmotta-rio-api/pom.xml | 12 + .../marmotta-rio-ical/pom.xml | 12 + .../marmotta-rio-rss/pom.xml | 7 + .../marmotta-rio-vcard/pom.xml | 12 + .../marmotta-sail-contextaware/pom.xml | 12 + .../marmotta-sail-transactions/pom.xml | 12 + .../marmotta-util-facading/pom.xml | 12 + .../marmotta-util-filter/pom.xml | 12 + .../marmotta-util-tripletable/pom.xml | 12 + extras/webjars/sgvizler/pom.xml | 8 + .../webjars/sgvizler/0.5.1/lib/d3.v2.min.js | 1 - .../0.5.1/lib/raphael-dracula.pack.min.js | 1 - .../webjars/sgvizler/0.5.1/sgvizler.chart.css | 1 - .../webjars/sgvizler/0.5.1/sgvizler.js | 1 - extras/webjars/snorql/pom.xml | 9 +- .../snorql/src/main/resources/namespaces.js | 24 +- .../snorql/src/main/resources/prototype.js | 17 - .../src/main/resources/scriptaculous/builder.js | 17 - .../main/resources/scriptaculous/controls.js | 30 +- .../main/resources/scriptaculous/dragdrop.js | 23 +- .../src/main/resources/scriptaculous/effects.js | 28 +- .../resources/scriptaculous/scriptaculous.js | 52 ++- .../src/main/resources/scriptaculous/slider.js | 22 +- .../src/main/resources/scriptaculous/sound.js | 24 +- .../main/resources/scriptaculous/unittest.js | 24 +- .../webjars/snorql/src/main/resources/snorql.js | 17 - .../webjars/snorql/src/main/resources/sparql.js | 75 ++-- .../snorql/src/main/resources/xml-to-html.xsl | 366 +++++++++---------- extras/webjars/strftime/pom.xml | 7 + libraries/ldclient/ldclient-api/pom.xml | 12 + libraries/ldclient/ldclient-core/pom.xml | 7 + .../ldclient/ldclient-provider-rdf/pom.xml | 12 + parent/pom.xml | 9 + platform/marmotta-versioning-common/pom.xml | 3 +- 34 files changed, 467 insertions(+), 426 deletions(-) ----------------------------------------------------------------------
