Merge branch 'develop' into develop-next
Conflicts: include/class.ticket.php
No related branches found
No related tags found
Showing
- bootstrap.php 1 addition, 1 deletionbootstrap.php
- include/ajax.tickets.php 42 additions, 36 deletionsinclude/ajax.tickets.php
- include/class.dynamic_forms.php 103 additions, 0 deletionsinclude/class.dynamic_forms.php
- include/class.forms.php 13 additions, 0 deletionsinclude/class.forms.php
- include/class.http.php 7 additions, 2 deletionsinclude/class.http.php
- include/class.mailer.php 4 additions, 5 deletionsinclude/class.mailer.php
- include/class.orm.php 9 additions, 1 deletioninclude/class.orm.php
- include/class.signal.php 1 addition, 1 deletioninclude/class.signal.php
- include/class.thread.php 1 addition, 1 deletioninclude/class.thread.php
- include/class.ticket.php 2 additions, 8 deletionsinclude/class.ticket.php
- include/client/header.inc.php 1 addition, 0 deletionsinclude/client/header.inc.php
- include/mysqli.php 12 additions, 6 deletionsinclude/mysqli.php
- include/staff/header.inc.php 1 addition, 0 deletionsinclude/staff/header.inc.php
- include/staff/tickets.inc.php 36 additions, 20 deletionsinclude/staff/tickets.inc.php
- include/upgrader/streams/core/c00511c7-7be60a84.patch.sql 1 addition, 1 deletioninclude/upgrader/streams/core/c00511c7-7be60a84.patch.sql
- js/redactor-osticket.js 6 additions, 1 deletionjs/redactor-osticket.js
- scp/forms.php 1 addition, 0 deletionsscp/forms.php
- setup/inc/class.installer.php 1 addition, 3 deletionssetup/inc/class.installer.php
Loading
Please register or sign in to comment