Skip to content

Commit

Permalink
Merge pull request #110 from diging/task/CCP-155
Browse files Browse the repository at this point in the history 
Task/ccp 155
  • Loading branch information
@jdamerow
jdamerow authored Jul 14, 2016
2 parents e7b7c0f + ad1e7cb commit 1b47244
Show file tree
Hide file tree
Showing 5 changed files with 18,693 additions and 7 deletions.
6 changes: 2 additions & 4 deletions Conceptpower+Spring/src/main/webapp/WEB-INF/tiles/skeleton.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,10 @@


<script
src="${pageContext.servletContext.contextPath}/resources/js/jquery.min.js"></script>
src="${pageContext.servletContext.contextPath}/resources/js/jquery-3.1.0.min.js"></script>

<script
src="${pageContext.servletContext.contextPath}/resources/js/jquery-1.10.2.js"></script>
<script
src="${pageContext.servletContext.contextPath}/resources/js/jquery-ui.js"></script>
src="${pageContext.servletContext.contextPath}/resources/js/jquery-ui-1.12.js"></script>

<script
src="${pageContext.servletContext.contextPath}/resources/js/bootstrap.min.js"></script>
Expand Down
1 change: 0 additions & 1 deletion Conceptpower+Spring/src/main/webapp/WEB-INF/views/auth/lucene/luceneindex.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@

</div>

<script src="http://cdn.jsdelivr.net/jquery/3.0.0-beta1/jquery.min.js"></script>
<script
src="${pageContext.servletContext.contextPath}/resources/js/waitMe.js"></script>

Expand Down
4 changes: 4 additions & 0 deletions Conceptpower+Spring/src/main/webapp/resources/js/jquery-3.1.0.min.js
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 1b47244

Please sign in to comment.