Merge remote branch 'adriane/issues/misc-fixes' into develop-next
Conflicts: include/staff/ticket-view.inc.php
Showing
- assets/default/css/theme.css 0 additions, 22 deletionsassets/default/css/theme.css
- include/ajax.tasks.php 2 additions, 3 deletionsinclude/ajax.tasks.php
- include/ajax.thread.php 1 addition, 1 deletioninclude/ajax.thread.php
- include/ajax.tickets.php 2 additions, 3 deletionsinclude/ajax.tickets.php
- include/class.collaborator.php 0 additions, 6 deletionsinclude/class.collaborator.php
- include/class.template.php 0 additions, 36 deletionsinclude/class.template.php
- include/class.thread.php 21 additions, 25 deletionsinclude/class.thread.php
- include/class.thread_actions.php 1 addition, 1 deletioninclude/class.thread_actions.php
- include/class.ticket.php 49 additions, 139 deletionsinclude/class.ticket.php
- include/client/templates/thread-entry.tmpl.php 3 additions, 8 deletionsinclude/client/templates/thread-entry.tmpl.php
- include/client/view.inc.php 0 additions, 8 deletionsinclude/client/view.inc.php
- include/i18n/en_US/help/tips/tickets.queue.yaml 10 additions, 0 deletionsinclude/i18n/en_US/help/tips/tickets.queue.yaml
- include/i18n/en_US/templates/email/ticket.activity.notice.bcc.yaml 0 additions, 38 deletions...18n/en_US/templates/email/ticket.activity.notice.bcc.yaml
- include/i18n/en_US/templates/email/ticket.notice.bcc.yaml 0 additions, 52 deletionsinclude/i18n/en_US/templates/email/ticket.notice.bcc.yaml
- include/i18n/en_US/templates/email/ticket.reply.bcc.yaml 0 additions, 39 deletionsinclude/i18n/en_US/templates/email/ticket.reply.bcc.yaml
- include/staff/templates/collaborators.tmpl.php 0 additions, 10 deletionsinclude/staff/templates/collaborators.tmpl.php
- include/staff/templates/thread-entry.tmpl.php 6 additions, 7 deletionsinclude/staff/templates/thread-entry.tmpl.php
- include/staff/ticket-open.inc.php 130 additions, 123 deletionsinclude/staff/ticket-open.inc.php
- include/staff/ticket-view.inc.php 73 additions, 81 deletionsinclude/staff/ticket-view.inc.php
- include/upgrader/streams/core/ad9d0a5f-0ca85857.patch.sql 1 addition, 2 deletionsinclude/upgrader/streams/core/ad9d0a5f-0ca85857.patch.sql
Loading
Please register or sign in to comment