Merge remote-tracking branch 'osticket/develop-next' into develop-next
Conflicts: include/class.filter.php
No related branches found
No related tags found
Showing
- file.php 6 additions, 3 deletionsfile.php
- include/ajax.tasks.php 8 additions, 6 deletionsinclude/ajax.tasks.php
- include/ajax.tickets.php 8 additions, 8 deletionsinclude/ajax.tickets.php
- include/class.attachment.php 8 additions, 5 deletionsinclude/class.attachment.php
- include/class.canned.php 1 addition, 1 deletioninclude/class.canned.php
- include/class.file.php 2 additions, 2 deletionsinclude/class.file.php
- include/class.filter.php 31 additions, 21 deletionsinclude/class.filter.php
- include/class.forms.php 69 additions, 28 deletionsinclude/class.forms.php
- include/class.misc.php 79 additions, 0 deletionsinclude/class.misc.php
- include/class.queue.php 2 additions, 2 deletionsinclude/class.queue.php
- include/class.thread.php 20 additions, 19 deletionsinclude/class.thread.php
- include/class.thread_actions.php 1 addition, 0 deletionsinclude/class.thread_actions.php
- include/class.ticket.php 10 additions, 9 deletionsinclude/class.ticket.php
- include/i18n/en_US/templates/ticket/upgraded.yaml 1 addition, 1 deletioninclude/i18n/en_US/templates/ticket/upgraded.yaml
- include/staff/ticket-open.inc.php 1 addition, 0 deletionsinclude/staff/ticket-open.inc.php
- include/upgrader/done.inc.php 2 additions, 2 deletionsinclude/upgrader/done.inc.php
- open.php 1 addition, 1 deletionopen.php
- scp/tasks.php 2 additions, 6 deletionsscp/tasks.php
- scp/tickets.php 8 additions, 6 deletionsscp/tickets.php
- tickets.php 1 addition, 1 deletiontickets.php
Loading
Please register or sign in to comment