zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source 
Conflicts:
	core-js/pom.xml
	mindplot/pom.xml
	pom.xml
	web2d/pom.xml
	wise-editor/pom.xml
	wise-webapp/pom.xml
This commit is contained in:
Ezequiel Bergamaschi
2015-10-29 23:06:57 -03:00
parent 17be6f8443 a51846e536
commit 8db908912c
18 changed files with 219 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wise-webapp/pom.xml
View File

@@ -9,7 +9,7 @@
<groupId>org.wisemapping</groupId>
<artifactId>wisemapping</artifactId>
<relativePath>../pom.xml</relativePath>
<version>4.0.2</version>
<version>4.0.3</version>
</parent>
<repositories>

1
wise-webapp/src/main/java/com/wisemapping/filter/SupportedUserAgent.java
View File

@@ -48,6 +48,7 @@ public class SupportedUserAgent implements Serializable {
boolean result = browser == Browser.FIREFOX && majorVersion >= 10;
result = result || browser == Browser.FIREFOX2 && majorVersion >= 17;
result = result || browser == Browser.FIREFOX3 && majorVersion >= 29;
result = result || browser == Browser.FIREFOX4 && majorVersion >= 40;
result = result || browser == Browser.IE8 || browser == Browser.IE9 || browser == Browser.IE11 ;
result = result || browser == Browser.IE && majorVersion >= 8;
result = result || browser == Browser.OPERA10 && majorVersion >= 11;

2
wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
View File

@@ -72,7 +72,7 @@ public class AdminController extends BaseController {
}
@ApiOperation("Note: Administration permissions required.")
@RequestMapping(method = RequestMethod.GET, value = "admin/users/email/{email}", produces = {"application/json", "application/xml"})
@RequestMapping(method = RequestMethod.GET, value = "admin/users/email/{email:.+}", produces = {"application/json", "application/xml"})
@ResponseBody
public RestUser getUserByEmail(@PathVariable String email) throws IOException {
final User user = userService.getUserBy(email);

1
wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
View File

@@ -51,6 +51,7 @@ public class RestUser {
public RestUser(@NotNull User user) {
this.user = user;
this.password = user.getPassword();
}
public Calendar getCreationDate() {

3
wise-webapp/src/main/webapp/jsp/mindmapEditorKeyboard.jsp
View File

@@ -25,6 +25,9 @@
color: #ffffff;
}
</style>
<script>
function submitDialogForm() {}
</script>
<div id="keyboardTable">
<table>

8
wise-webapp/src/main/webapp/jsp/mindmapEmbed.jsp
View File

@@ -58,14 +58,6 @@
var persistence = mindplot.PersistenceManager.getInstance();
var mindmap = mindmap = persistence.load(mapId);
designer.loadMap(mindmap);
$('zoomIn').addEvent('click', function () {
designer.zoomIn();
});
$('zoomOut').addEvent('click', function () {
designer.zoomOut();
});
});
</script>
</head>

8
wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp
View File

@@ -90,14 +90,6 @@
var persistence = mindplot.PersistenceManager.getInstance();
var mindmap = mindmap = persistence.load(mapId);
designer.loadMap(mindmap);
$('zoomIn').addEvent('click', function () {
designer.zoomIn();
});
$('zoomOut').addEvent('click', function () {
designer.zoomOut();
});
});
</script>
</head>