Skip to content
Snippets Groups Projects
Commit 6095d0b3 authored by Peter Rotich's avatar Peter Rotich
Browse files

Merge remote branch 'upstream/develop' into develop

parents 8a52067f 91602a7e
Branches
Tags
No related merge requests found
osTicket v1.10.6
================
### Enhancements
* issue: Upgrader Wrong Guide Link (#4739)
* iframe: Allow Multiple iFrame Domains (#4781)
* issue: Strip Emoticons (#4523)
### Improvements
* issue: Maxfilesize Comma Crash (#4340)
* issue: No Save Button On Quicknotes (#4706)
* issue: PHP 7.2 Ticket Status (#4758)
* issue: Canned Response Variables (#4759)
* issue: FAQ Search Results (#4771)
* issue: FAQ Return Errors (#4772)
* issue: Duplicate Form Titles (#4788)
* issue: Organizations Users Sort (#4806)
* oops: Emojis Strip Korean (#4823)
* issue: iFrame On Install (#4824)
* issue: sendAccessLink On NULL (#4828)
* Update README.md (eccc57a, e5f4180)
* issue: iFrame Single Quotes (#4844)
* issue: .eml/.msg Attachments (#4857)
### Performance and Security
* xss: XSS To LFI Vulnerability (#4869)
* jquery: Update Again (#4858)
osTicket v1.10.5
================
### Enhancements
......
......@@ -43,7 +43,7 @@ if ($lang) {
<link type="text/css" rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/flags.css">
<link type="text/css" rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/rtl.css"/>
<link type="text/css" rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/select2.min.css">
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-3.4.0.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-ui-1.12.1.custom.min.js"></script>
<script src="<?php echo ROOT_PATH; ?>js/osticket.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/filedrop.field.js"></script>
......
......@@ -28,7 +28,7 @@ if ($lang) {
.tip_shadow { display:block !important; }
</style>
<![endif]-->
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-3.4.0.min.js"></script>
<link rel="stylesheet" href="<?php echo ROOT_PATH ?>css/thread.css" media="all">
<link rel="stylesheet" href="<?php echo ROOT_PATH ?>scp/css/scp.css" media="all">
<link rel="stylesheet" href="<?php echo ROOT_PATH; ?>css/redactor.css" media="screen">
......
......@@ -14,7 +14,7 @@ header("Content-Security-Policy: frame-ancestors ".$cfg->getAllowIframes().";");
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="pragma" content="no-cache" />
<meta name="viewport" content="width=device-width, initial-scale=1">
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="<?php echo ROOT_PATH; ?>js/jquery-3.4.0.min.js"></script>
<script type="text/javascript">
$(document).ready(function() {
$("input:not(.dp):visible:enabled:first").focus();
......
This diff is collapsed.
This diff is collapsed.
......@@ -4,7 +4,7 @@
</div> <!-- wizard -->
<div id="footer" class="centered">Copyright &copy; <?php echo date('Y'); ?> <a target="_blank" href="http://osticket.com">osTicket.com</a></div>
<script type="text/javascript" src="../js/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../js/jquery-3.4.0.min.js"></script>
<script type="text/javascript" src="../js/jstz.min.js"></script>
<script type="text/javascript" src="js/setup.js"></script>
<script type="text/javascript" src="js/tips.js"></script>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment