You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2015/05/27 13:10:23 UTC
[1/2] marmotta git commit: disable uglify cause it causes errors
Repository: marmotta
Updated Branches:
refs/heads/develop 348e60bdb -> d0810b40d
disable uglify cause it causes errors
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/48fa991a
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/48fa991a
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/48fa991a
Branch: refs/heads/develop
Commit: 48fa991a59fdcbedd6ebca1fa8b216f699de26a1
Parents: 348e60b
Author: tkurz <tk...@apache.org>
Authored: Wed May 27 12:48:09 2015 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed May 27 12:48:09 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../src/main/resources/web/admin/squebi.html | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/48fa991a/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 035c314..f047ba5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1003,7 +1003,7 @@
<dependency>
<groupId>com.github.tkurz.webjars</groupId>
<artifactId>squebi</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/48fa991a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
index a2d9348..4beb74b 100644
--- a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
+++ b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
@@ -25,7 +25,7 @@
SQUEBI = {
selectService : "../select",
updateService : "../update",
- home : "../../webjars/squebi/1.0.1",
+ home : "../../webjars/squebi/1.0.2",
hints : [],
container : '#squebi_container',
browse : {
@@ -43,14 +43,14 @@
"outputQueryParam":"output"
};
</script>
- <script data-main="../../webjars/squebi/1.0.1/squebi" src="../../webjars/requirejs/2.1.15/require.js"></script>
- <link href="../../webjars/squebi/1.0.1/squebi.css" rel="stylesheet" type="text/css">
+ <script data-main="../../webjars/squebi/1.0.2/squebi" src="../../webjars/requirejs/2.1.15/require.js"></script>
+ <link href="../../webjars/squebi/1.0.2/squebi.css" rel="stylesheet" type="text/css">
<!--###END_HEAD###-->
</head>
<body>
<!--###BEGIN_CONTENT###-->
<div id="appLoader" style="margin-top: 100px; text-align: center; margin-bottom: 100px">
- <img src="../../webjars/squebi/1.0.1/img/ajax-loader-big.gif">
+ <img src="../../webjars/squebi/1.0.2/img/ajax-loader-big.gif">
</div>
<div style="display: none" id="squebi_container" class="container">
<div ng-controller="SampleCtrl" class="header">
@@ -103,7 +103,7 @@
<div ng-show="showResults" ng-controller="ResultCtrl" class="row result">
<div ng-show="!loader" ng-include src="template"></div>
<div class="loader" ng-show="loader">
- <img src="../../webjars/squebi/1.0.1/img/ajax-loader-big.gif">
+ <img src="../../webjars/squebi/1.0.2/img/ajax-loader-big.gif">
</div>
</div>
[2/2] marmotta git commit: MARMOTTA-614 #resolve update squebi to
version 1.0.3 should do the thing
Posted by tk...@apache.org.
MARMOTTA-614 #resolve update squebi to version 1.0.3 should do the thing
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d0810b40
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d0810b40
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d0810b40
Branch: refs/heads/develop
Commit: d0810b40dfeeb3b52c1fd7dfe7eaab3e22dcefdb
Parents: 48fa991
Author: tkurz <tk...@apache.org>
Authored: Wed May 27 13:10:02 2015 +0200
Committer: tkurz <tk...@apache.org>
Committed: Wed May 27 13:10:02 2015 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
.../src/main/resources/web/admin/squebi.html | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d0810b40/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f047ba5..4848096 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1003,7 +1003,7 @@
<dependency>
<groupId>com.github.tkurz.webjars</groupId>
<artifactId>squebi</artifactId>
- <version>1.0.2</version>
+ <version>1.0.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d0810b40/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
index 4beb74b..c855aab 100644
--- a/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
+++ b/platform/marmotta-sparql/src/main/resources/web/admin/squebi.html
@@ -25,7 +25,7 @@
SQUEBI = {
selectService : "../select",
updateService : "../update",
- home : "../../webjars/squebi/1.0.2",
+ home : "../../webjars/squebi/1.0.3",
hints : [],
container : '#squebi_container',
browse : {
@@ -43,14 +43,14 @@
"outputQueryParam":"output"
};
</script>
- <script data-main="../../webjars/squebi/1.0.2/squebi" src="../../webjars/requirejs/2.1.15/require.js"></script>
- <link href="../../webjars/squebi/1.0.2/squebi.css" rel="stylesheet" type="text/css">
+ <script data-main="../../webjars/squebi/1.0.3/squebi" src="../../webjars/requirejs/2.1.15/require.js"></script>
+ <link href="../../webjars/squebi/1.0.3/squebi.css" rel="stylesheet" type="text/css">
<!--###END_HEAD###-->
</head>
<body>
<!--###BEGIN_CONTENT###-->
<div id="appLoader" style="margin-top: 100px; text-align: center; margin-bottom: 100px">
- <img src="../../webjars/squebi/1.0.2/img/ajax-loader-big.gif">
+ <img src="../../webjars/squebi/1.0.3/img/ajax-loader-big.gif">
</div>
<div style="display: none" id="squebi_container" class="container">
<div ng-controller="SampleCtrl" class="header">
@@ -103,7 +103,7 @@
<div ng-show="showResults" ng-controller="ResultCtrl" class="row result">
<div ng-show="!loader" ng-include src="template"></div>
<div class="loader" ng-show="loader">
- <img src="../../webjars/squebi/1.0.2/img/ajax-loader-big.gif">
+ <img src="../../webjars/squebi/1.0.3/img/ajax-loader-big.gif">
</div>
</div>