Merge remote branch 'adriane/issues/misc-fixes' into issue/mailer+recipients
Conflicts: include/class.ticket.php
No related branches found
No related tags found
Showing
- account.php 3 additions, 4 deletionsaccount.php
- include/ajax.content.php 0 additions, 1 deletioninclude/ajax.content.php
- include/ajax.tickets.php 60 additions, 0 deletionsinclude/ajax.tickets.php
- include/class.dept.php 1 addition, 1 deletioninclude/class.dept.php
- include/class.email.php 9 additions, 7 deletionsinclude/class.email.php
- include/class.forms.php 43 additions, 0 deletionsinclude/class.forms.php
- include/class.report.php 3 additions, 0 deletionsinclude/class.report.php
- include/class.thread.php 27 additions, 9 deletionsinclude/class.thread.php
- include/class.ticket.php 23 additions, 10 deletionsinclude/class.ticket.php
- include/class.user.php 2 additions, 8 deletionsinclude/class.user.php
- include/i18n/en_US/role.yaml 6 additions, 0 deletionsinclude/i18n/en_US/role.yaml
- include/i18n/en_US/templates/email/ticket.notice.yaml 3 additions, 0 deletionsinclude/i18n/en_US/templates/email/ticket.notice.yaml
- include/staff/dashboard.inc.php 3 additions, 3 deletionsinclude/staff/dashboard.inc.php
- include/staff/templates/release.tmpl.php 89 additions, 0 deletionsinclude/staff/templates/release.tmpl.php
- include/staff/ticket-open.inc.php 4 additions, 0 deletionsinclude/staff/ticket-open.inc.php
- include/staff/ticket-view.inc.php 11 additions, 9 deletionsinclude/staff/ticket-view.inc.php
- include/upgrader/streams/core.sig 1 addition, 1 deletioninclude/upgrader/streams/core.sig
- include/upgrader/streams/core/0ca85857-86707325.patch.sql 2 additions, 2 deletionsinclude/upgrader/streams/core/0ca85857-86707325.patch.sql
- include/upgrader/streams/core/70921d5c-26fd79dc.patch.sql 31 additions, 0 deletionsinclude/upgrader/streams/core/70921d5c-26fd79dc.patch.sql
- scp/ajax.php 1 addition, 0 deletionsscp/ajax.php
Loading
Please register or sign in to comment