Merge remote branch 'upstream/develop' into develop-next
Conflicts: include/client/header.inc.php scp/js/scp.js
Showing
- include/client/header.inc.php 2 additions, 2 deletionsinclude/client/header.inc.php
- include/staff/footer.inc.php 1 addition, 1 deletioninclude/staff/footer.inc.php
- include/staff/header.inc.php 1 addition, 1 deletioninclude/staff/header.inc.php
- include/staff/login.header.php 1 addition, 1 deletioninclude/staff/login.header.php
- include/staff/templates/queue-sort.tmpl.php 2 additions, 1 deletioninclude/staff/templates/queue-sort.tmpl.php
- include/staff/ticket-tasks.inc.php 1 addition, 1 deletioninclude/staff/ticket-tasks.inc.php
- js/filedrop.field.js 0 additions, 2 deletionsjs/filedrop.field.js
- js/jquery-1.11.2.min.js 0 additions, 4 deletionsjs/jquery-1.11.2.min.js
- js/jquery-3.3.1.min.js 2 additions, 0 deletionsjs/jquery-3.3.1.min.js
- js/jquery-ui-1.10.3.custom.min.js 0 additions, 7 deletionsjs/jquery-ui-1.10.3.custom.min.js
- js/jquery-ui-1.12.1.custom.min.js 13 additions, 0 deletionsjs/jquery-ui-1.12.1.custom.min.js
- js/jquery.pjax.js 202 additions, 145 deletionsjs/jquery.pjax.js
- js/redactor-osticket.js 5 additions, 2 deletionsjs/redactor-osticket.js
- scp/js/jquery.dropdown.js 1 addition, 1 deletionscp/js/jquery.dropdown.js
- scp/js/jquery.translatable.js 1 addition, 1 deletionscp/js/jquery.translatable.js
- scp/js/scp.js 1 addition, 1 deletionscp/js/scp.js
- setup/inc/footer.inc.php 1 addition, 1 deletionsetup/inc/footer.inc.php
Loading
Please register or sign in to comment