Merge branch 'develop'

Conflicts: core-js/pom.xml mindplot/pom.xml pom.xml web2d/pom.xml wise-editor/pom.xml wise-webapp/pom.xml
2015-02-21 13:08:22 -03:00
parent d955e44167 9e2e8a56d0
commit 59f0ed5793
10 changed files with 35 additions and 11 deletions
--- a/wise-editor/pom.xml
+++ b/wise-editor/pom.xml
@@ -9,7 +9,7 @@
        <groupId>org.wisemapping</groupId>
        <artifactId>wisemapping</artifactId>
        <relativePath>../pom.xml</relativePath>
-        <version>4.0.0</version>
+        <version>4.0.1</version>
    </parent>

    <dependencies>
--- a/wise-editor/src/main/webapp/js/editor.js
+++ b/wise-editor/src/main/webapp/js/editor.js
@@ -31,6 +31,7 @@ Browser = {
    ie6: !window.XMLHttpRequest,
    ie7: document.all && window.XMLHttpRequest && !XDomainRequest && !window.opera,
    ie8: document.documentMode==8,
+    ie11: document.documentMode==11,
    opera: Boolean(window.opera),
    chrome: Boolean(window.chrome),
    safari: window.getComputedStyle && !window.globalStorage && !window.opera,