Commit 77a3b7c6 authored by Matija Obreza's avatar Matija Obreza

Added start_tls to spring-mail.xml

/index.html not decorated (AWS LB check)
jquery-ui.js include in all.js
parent a60d282c
......@@ -575,6 +575,7 @@
<output>${project.build.directory}/${project.build.finalName}/html/js/all.min.js</output>
<includes>
<include>jquery.min.js</include>
<include>jquery-ui.min.js</include>
<include>bootstrap.min.js</include>
<include>tab.min.js</include>
<include>crophub.min.js</include>
......
......@@ -34,6 +34,7 @@
<property name="javaMailProperties">
<props>
<prop key="mail.smtp.ssl.enable">${mail.smtp.ssl.enable}</prop>
<prop key="mail.smtp.starttls.enable">${mail.smtp.starttls.enable}</prop>
<prop key="mail.smtp.auth">${mail.smtp.auth}</prop>
<prop key="mail.transport.protocol">${mail.transport.protocol}</prop>
</props>
......
......@@ -63,6 +63,7 @@ mail.user.password=
mail.user.name=
mail.smtp.ssl.enable=true
mail.smtp.starttls.enable=true
mail.smtp.auth=true
mail.transport.protocol=smtp
......
......@@ -42,16 +42,19 @@
</c:when>
<c:when test="${requestContext.theme.name eq 'all-min'}">
<script type="text/javascript" src="/html/js/jquery.min.js"></script>
<script type="text/javascript" src="/html/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/html/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/html/js/genesys.min.js"></script>
</c:when>
<c:when test="${requestContext.theme.name eq 'all'}">
<script type="text/javascript" src="/html/js/jquery.js"></script>
<script type="text/javascript" src="/html/js/jquery-ui.js"></script>
<script type="text/javascript" src="/html/js/bootstrap.js"></script>
<script type="text/javascript" src="/html/js/genesys.js"></script>
</c:when>
<c:otherwise>
<script type="text/javascript" src="/html/js/jquery.js"></script>
<script type="text/javascript" src="/html/js/jquery-ui.js"></script>
<script type="text/javascript" src="/html/js/bootstrap.js"></script>
<script type="text/javascript" src="/html/js/tab.js"></script>
<script type="text/javascript" src="/html/js/crophub.js"></script>
......
......@@ -63,7 +63,6 @@
<a href="<c:url value="${backUrl}" />" class="btn btn-default"><spring:message code="cancel" /></a>
<content tag="javascript">
<script type="text/javascript" src="/html/js/jquery-ui.min.js"></script>
<script type="text/javascript">
jQuery(document).ready(function() {
$("#permissionAdder input[type=button]").on("click", function(a,b,c) {
......
......@@ -85,7 +85,6 @@
<content tag="javascript">
<script type="text/javascript" src="<c:url value="/html/js/jquery-ui.min.js" />"></script>
<script type="text/javascript">
jQuery(document).ready(function() {
// alert('${jsonFilter}');
......
......@@ -88,7 +88,6 @@
</div>
</div>
<content tag="javascript">
<script type="text/javascript" src="<c:url value="/html/js/jquery-ui.min.js" />"></script>
<script type="text/javascript">
$( document ).ready(function() {
$('#news a').click(function (e) {
......
......@@ -25,6 +25,7 @@
<mapping path="/welcome" decorator="/WEB-INF/decorator/entry.jsp" />
<mapping path="/*" decorator="/WEB-INF/decorator/main.jsp" />
<mapping path="/html/*" exclude="true" />
<mapping path="/index.html" exclude="true" />
<mapping path="*/ajax/*" exclude="true" />
</sitemesh>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment