vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-12-22 11:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/WISE-15-mindmapListFolderSupport

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2014-02-01 19:18:57 -03:00
commit 37e9676687
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/webapp/js/jquery-1.7.2.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wise-webapp/src/main/webapp/js/jquery-2.1.0.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

2
wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
View File

@ -20,7 +20,7 @@
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/>

2
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@ -3,7 +3,7 @@
<%--@elvariable id="isHsql" type="boolean"--%>
<script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="js/jquery-2.1.0.min.js"></script>
<script type="text/javascript" language="javascript">
$(function () {
$('#loginForm').submit(function () {

4
wise-webapp/src/main/webapp/jsp/loginOpenId.jsp
View File

@ -4,7 +4,7 @@
<%--@elvariable id="isHsql" type="boolean"--%>
<!-- Simple OpenID Selector -->
<link type="text/css" rel="stylesheet" href="css/openid.css"/>
<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
<script type="text/javascript" language="javascript" src="js/openid-jquery.js"></script>
<script type="text/javascript" language="javascript" src="js/openid-en.js"></script>
<!-- /Simple OpenID Selector -->
@ -14,7 +14,7 @@
});
</script>
<script type="text/javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="js/jquery-2.1.0.min.js"></script>
<script type="text/javascript" language="javascript">
$(function () {
$('#loginForm').submit(function () {

2
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@ -16,7 +16,7 @@
<link rel="stylesheet/less" type="text/css" href="css/mindmapList.less"/>
<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" language="javascript" src="js/jquery-2.1.0.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap-colorpicker.js"></script>