mirror of
https://bitbucket.org/wisemapping/wisemapping-open-source.git
synced 2024-12-24 12:13:49 +01:00
Merge remote-tracking branch 'origin/develop' into feature/remove_mootols
Conflicts: mindplot/src/main/javascript/widget/LinkIconTooltip.js pom.xml
This commit is contained in:
commit
513781272e
@ -8,7 +8,7 @@ BASE_DIR=`pwd`
|
|||||||
TARGET_DIR=$BASE_DIR/target
|
TARGET_DIR=$BASE_DIR/target
|
||||||
JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
|
JETTY_DIR=$TARGET_DIR/wisemapping-$WISE_VERSION
|
||||||
WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping
|
WISE_WEBAPP_DIR=$JETTY_DIR/webapps/wisemapping
|
||||||
JETTY_VERSION=8.1.14.v20131031
|
JETTY_VERSION=8.1.16.v20140903
|
||||||
JETTY_DIST_DIR=jetty-distribution-${JETTY_VERSION}
|
JETTY_DIST_DIR=jetty-distribution-${JETTY_VERSION}
|
||||||
JETTY_ZIP=${JETTY_DIST_DIR}.zip
|
JETTY_ZIP=${JETTY_DIST_DIR}.zip
|
||||||
|
|
||||||
|
16
pom.xml
16
pom.xml
@ -8,6 +8,10 @@
|
|||||||
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
|
<superpom.dir>${project.basedir}/wise-webapps</superpom.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
|
<scm>
|
||||||
|
<developerConnection>scm:git:git@bitbucket.org:wisemapping/wisemapping-open-source.git</developerConnection>
|
||||||
|
</scm>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.wisemapping</groupId>
|
<groupId>org.wisemapping</groupId>
|
||||||
<artifactId>wisemapping</artifactId>
|
<artifactId>wisemapping</artifactId>
|
||||||
@ -94,6 +98,9 @@
|
|||||||
<groupId>com.github.searls</groupId>
|
<groupId>com.github.searls</groupId>
|
||||||
<artifactId>jasmine-maven-plugin</artifactId>
|
<artifactId>jasmine-maven-plugin</artifactId>
|
||||||
<version>1.3.1.5</version>
|
<version>1.3.1.5</version>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-release-plugin</artifactId>
|
||||||
|
<version>2.5</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</pluginManagement>
|
</pluginManagement>
|
||||||
@ -178,6 +185,15 @@
|
|||||||
</reportPlugins>
|
</reportPlugins>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>external.atlassian.jgitflow</groupId>
|
||||||
|
<artifactId>jgitflow-maven-plugin</artifactId>
|
||||||
|
<version>1.0-m4.3</version>
|
||||||
|
<configuration>
|
||||||
|
<masterBranchName>master</masterBranchName>
|
||||||
|
<developBranchName>develop</developBranchName>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ security.openid.enabled=false
|
|||||||
|
|
||||||
# REST Documentation
|
# REST Documentation
|
||||||
#
|
#
|
||||||
# This properties are used for REST API Documentation( http://localhost:8080/doc/rest/index.html)
|
# This properties are used for REST API Documentation( http://localhost:8080/wisemapping/doc/rest/index.html)
|
||||||
# Change the URL for proper documentation console setup.
|
# Change the URL for proper documentation console setup.
|
||||||
documentation.services.basePath=http://localhost:8080/wisemapping/service
|
documentation.services.basePath=http://localhost:8080/wisemapping/service
|
||||||
documentation.services.version=3.0.1
|
documentation.services.version=3.0.1
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
|
supportedSubmitMethods: ['get', 'post', 'put', 'delete'],
|
||||||
onComplete: function(swaggerApi, swaggerUi){
|
onComplete: function(swaggerApi, swaggerUi){
|
||||||
if(console) {
|
if(console) {
|
||||||
console.log("Loaded SwaggerUI")
|
console.log("Loaded SwaggerUI")
|
||||||
}
|
}
|
||||||
$('pre code').each(function(i, e) {hljs.highlightBlock(e)});
|
$('pre code').each(function(i, e) {hljs.highlightBlock(e)});
|
||||||
},
|
},
|
||||||
@ -66,7 +66,7 @@
|
|||||||
<div class="swagger-ui-wrap">
|
<div class="swagger-ui-wrap">
|
||||||
<h1>Welcome REST API Console</h1>
|
<h1>Welcome REST API Console</h1>
|
||||||
<p>Use this console to learn how to use WiseMapping REST APIs. </p>
|
<p>Use this console to learn how to use WiseMapping REST APIs. </p>
|
||||||
<p><b>Important:</b> Don't forget to configure your server host url in /WEB-INF/app.properties. By default it's configure to http://localhost:8080/wisemapping/</p>
|
<p><b>Important:</b> Don't forget to configure your server host url in /WEB-INF/app.properties. By default it's configured to http://localhost:8080/wisemapping/</p>
|
||||||
<p></p>
|
<p></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -1281,10 +1281,8 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
|
|||||||
};
|
};
|
||||||
|
|
||||||
SwaggerUi.prototype.buildUrl = function(base, url) {
|
SwaggerUi.prototype.buildUrl = function(base, url) {
|
||||||
var parts;
|
|
||||||
console.log("base is " + base);
|
console.log("base is " + base);
|
||||||
parts = base.split("/");
|
base = base.substring(0,base.indexOf("/doc/"));
|
||||||
base = parts[0] + "//" + parts[2];
|
|
||||||
if (url.indexOf("/") === 0) {
|
if (url.indexOf("/") === 0) {
|
||||||
return base + url;
|
return base + url;
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user