Merge branch 'develop' into develop-next
Merge post 1.8.0 release commits Conflicts: include/staff/ticket-view.inc.php
No related branches found
No related tags found
Showing
- assets/default/css/theme.css 9 additions, 0 deletionsassets/default/css/theme.css
- bootstrap.php 13 additions, 8 deletionsbootstrap.php
- css/thread.css 29 additions, 1 deletioncss/thread.css
- include/ajax.tickets.php 12 additions, 10 deletionsinclude/ajax.tickets.php
- include/ajax.tips.php 3 additions, 2 deletionsinclude/ajax.tips.php
- include/ajax.users.php 35 additions, 2 deletionsinclude/ajax.users.php
- include/class.config.php 1 addition, 1 deletioninclude/class.config.php
- include/class.dynamic_forms.php 12 additions, 6 deletionsinclude/class.dynamic_forms.php
- include/class.forms.php 15 additions, 0 deletionsinclude/class.forms.php
- include/class.osticket.php 3 additions, 3 deletionsinclude/class.osticket.php
- include/class.setup.php 4 additions, 0 deletionsinclude/class.setup.php
- include/class.ticket.php 45 additions, 44 deletionsinclude/class.ticket.php
- include/class.upgrader.php 11 additions, 12 deletionsinclude/class.upgrader.php
- include/class.user.php 2 additions, 1 deletioninclude/class.user.php
- include/client/header.inc.php 1 addition, 1 deletioninclude/client/header.inc.php
- include/client/view.inc.php 2 additions, 2 deletionsinclude/client/view.inc.php
- include/staff/cannedresponse.inc.php 2 additions, 1 deletioninclude/staff/cannedresponse.inc.php
- include/staff/dynamic-form.inc.php 2 additions, 0 deletionsinclude/staff/dynamic-form.inc.php
- include/staff/faq.inc.php 3 additions, 2 deletionsinclude/staff/faq.inc.php
- include/staff/page.inc.php 2 additions, 1 deletioninclude/staff/page.inc.php
Loading
Please register or sign in to comment