Merge branch 'develop' into issue/385
Showing
- include/class.email.php 10 additions, 1 deletioninclude/class.email.php
- include/class.file.php 1 addition, 1 deletioninclude/class.file.php
- include/class.filter.php 1 addition, 1 deletioninclude/class.filter.php
- include/class.format.php 1 addition, 4 deletionsinclude/class.format.php
- include/class.mailer.php 14 additions, 1 deletioninclude/class.mailer.php
- include/class.mailfetch.php 24 additions, 6 deletionsinclude/class.mailfetch.php
- include/class.osticket.php 32 additions, 21 deletionsinclude/class.osticket.php
- include/class.ticket.php 11 additions, 12 deletionsinclude/class.ticket.php
- include/class.upgrader.php 1 addition, 1 deletioninclude/class.upgrader.php
- include/staff/footer.inc.php 4 additions, 0 deletionsinclude/staff/footer.inc.php
- include/staff/header.inc.php 8 additions, 0 deletionsinclude/staff/header.inc.php
- include/staff/ticket-view.inc.php 1 addition, 1 deletioninclude/staff/ticket-view.inc.php
- include/staff/tickets.inc.php 26 additions, 18 deletionsinclude/staff/tickets.inc.php
- include/upgrader/upgrade.inc.php 1 addition, 1 deletioninclude/upgrader/upgrade.inc.php
- scp/admin.inc.php 4 additions, 0 deletionsscp/admin.inc.php
- scp/css/scp.css 31 additions, 5 deletionsscp/css/scp.css
- scp/emailtest.php 1 addition, 1 deletionscp/emailtest.php
- scp/images/FhHRx-Spinner.gif 0 additions, 0 deletionsscp/images/FhHRx-Spinner.gif
- scp/js/scp.js 17 additions, 5 deletionsscp/js/scp.js
- scp/js/upgrader.js 1 addition, 1 deletionscp/js/upgrader.js
Loading
Please register or sign in to comment