Merge remote branch 'upstream/develop-next' into issue/next-stabilize
Conflicts: include/class.attachment.php include/class.config.php include/class.forms.php include/class.orm.php scp/css/scp.css
Showing
- assets/default/css/theme.css 219 additions, 39 deletionsassets/default/css/theme.css
- bootstrap.php 1 addition, 1 deletionbootstrap.php
- css/thread.css 1 addition, 1 deletioncss/thread.css
- include/ajax.reports.php 3 additions, 3 deletionsinclude/ajax.reports.php
- include/ajax.tickets.php 0 additions, 1 deletioninclude/ajax.tickets.php
- include/class.attachment.php 18 additions, 1 deletioninclude/class.attachment.php
- include/class.collaborator.php 4 additions, 2 deletionsinclude/class.collaborator.php
- include/class.config.php 3 additions, 3 deletionsinclude/class.config.php
- include/class.dept.php 6 additions, 14 deletionsinclude/class.dept.php
- include/class.dynamic_forms.php 68 additions, 5 deletionsinclude/class.dynamic_forms.php
- include/class.export.php 1 addition, 1 deletioninclude/class.export.php
- include/class.format.php 5 additions, 2 deletionsinclude/class.format.php
- include/class.forms.php 65 additions, 4 deletionsinclude/class.forms.php
- include/class.list.php 18 additions, 17 deletionsinclude/class.list.php
- include/class.mailer.php 14 additions, 3 deletionsinclude/class.mailer.php
- include/class.page.php 3 additions, 7 deletionsinclude/class.page.php
- include/class.sla.php 22 additions, 33 deletionsinclude/class.sla.php
- include/class.staff.php 24 additions, 0 deletionsinclude/class.staff.php
- include/class.team.php 17 additions, 7 deletionsinclude/class.team.php
- include/class.thread.php 340 additions, 6 deletionsinclude/class.thread.php
Loading
Please register or sign in to comment