Merge branch 'feature/user_lookup-revisited' into feature/cc
Conflicts: include/ajax.forms.php include/ajax.tickets.php include/class.user.php include/staff/ticket-view.inc.php
Showing
- include/ajax.forms.php 0 additions, 24 deletionsinclude/ajax.forms.php
- include/ajax.tickets.php 76 additions, 0 deletionsinclude/ajax.tickets.php
- include/ajax.users.php 59 additions, 7 deletionsinclude/ajax.users.php
- include/class.dynamic_forms.php 19 additions, 5 deletionsinclude/class.dynamic_forms.php
- include/class.forms.php 7 additions, 0 deletionsinclude/class.forms.php
- include/class.nav.php 2 additions, 0 deletionsinclude/class.nav.php
- include/class.ticket.php 57 additions, 33 deletionsinclude/class.ticket.php
- include/class.user.php 54 additions, 36 deletionsinclude/class.user.php
- include/staff/footer.inc.php 3 additions, 0 deletionsinclude/staff/footer.inc.php
- include/staff/header.inc.php 10 additions, 4 deletionsinclude/staff/header.inc.php
- include/staff/templates/user-info.tmpl.php 0 additions, 41 deletionsinclude/staff/templates/user-info.tmpl.php
- include/staff/templates/user-lookup.tmpl.php 61 additions, 27 deletionsinclude/staff/templates/user-lookup.tmpl.php
- include/staff/templates/user.tmpl.php 75 additions, 0 deletionsinclude/staff/templates/user.tmpl.php
- include/staff/ticket-edit.inc.php 18 additions, 13 deletionsinclude/staff/ticket-edit.inc.php
- include/staff/ticket-open.inc.php 74 additions, 4 deletionsinclude/staff/ticket-open.inc.php
- include/staff/ticket-view.inc.php 41 additions, 14 deletionsinclude/staff/ticket-view.inc.php
- scp/ajax.php 11 additions, 4 deletionsscp/ajax.php
- scp/css/scp.css 5 additions, 0 deletionsscp/css/scp.css
- scp/js/scp.js 44 additions, 0 deletionsscp/js/scp.js
- scp/js/ticket.js 1 addition, 1 deletionscp/js/ticket.js
Loading
Please register or sign in to comment