Merge remote-tracking branch 'osticket/develop-next' into develop-next
Conflicts: include/client/open.inc.php include/staff/templates/user-lookup.tmpl.php
No related branches found
No related tags found
Showing
- include/ajax.forms.php 2 additions, 1 deletioninclude/ajax.forms.php
- include/ajax.orgs.php 4 additions, 4 deletionsinclude/ajax.orgs.php
- include/ajax.search.php 2 additions, 3 deletionsinclude/ajax.search.php
- include/ajax.tickets.php 64 additions, 0 deletionsinclude/ajax.tickets.php
- include/ajax.users.php 4 additions, 4 deletionsinclude/ajax.users.php
- include/class.client.php 14 additions, 13 deletionsinclude/class.client.php
- include/class.config.php 5 additions, 0 deletionsinclude/class.config.php
- include/class.dynamic_forms.php 24 additions, 12 deletionsinclude/class.dynamic_forms.php
- include/class.faq.php 1 addition, 1 deletioninclude/class.faq.php
- include/class.file.php 12 additions, 0 deletionsinclude/class.file.php
- include/class.format.php 18 additions, 2 deletionsinclude/class.format.php
- include/class.forms.php 74 additions, 9 deletionsinclude/class.forms.php
- include/class.page.php 1 addition, 1 deletioninclude/class.page.php
- include/class.queue.php 1 addition, 1 deletioninclude/class.queue.php
- include/class.report.php 11 additions, 6 deletionsinclude/class.report.php
- include/class.search.php 63 additions, 26 deletionsinclude/class.search.php
- include/class.thread.php 19 additions, 0 deletionsinclude/class.thread.php
- include/class.ticket.php 14 additions, 8 deletionsinclude/class.ticket.php
- include/class.user.php 22 additions, 14 deletionsinclude/class.user.php
- include/client/open.inc.php 4 additions, 2 deletionsinclude/client/open.inc.php
Loading
Please register or sign in to comment