Merge remote branch 'upstream/v1.9.8' into develop-next
Conflicts: include/class.dynamic_forms.php include/class.forms.php include/class.organization.php include/class.staff.php include/staff/tickets.inc.php
No related branches found
No related tags found
Showing
- WHATSNEW.md 35 additions, 0 deletionsWHATSNEW.md
- include/class.dynamic_forms.php 7 additions, 1 deletioninclude/class.dynamic_forms.php
- include/class.format.php 1 addition, 1 deletioninclude/class.format.php
- include/class.forms.php 35 additions, 9 deletionsinclude/class.forms.php
- include/class.organization.php 2 additions, 1 deletioninclude/class.organization.php
- include/class.ostsession.php 167 additions, 31 deletionsinclude/class.ostsession.php
- include/class.plugin.php 7 additions, 1 deletioninclude/class.plugin.php
- include/class.staff.php 4 additions, 4 deletionsinclude/class.staff.php
- include/class.ticket.php 1 addition, 1 deletioninclude/class.ticket.php
- include/class.validator.php 9 additions, 1 deletioninclude/class.validator.php
- include/ost-sampleconfig.php 20 additions, 0 deletionsinclude/ost-sampleconfig.php
- include/staff/profile.inc.php 1 addition, 1 deletioninclude/staff/profile.inc.php
- include/staff/ticket-view.inc.php 2 additions, 0 deletionsinclude/staff/ticket-view.inc.php
- include/staff/tickets.inc.php 3 additions, 0 deletionsinclude/staff/tickets.inc.php
- include/staff/user-view.inc.php 1 addition, 0 deletionsinclude/staff/user-view.inc.php
- include/upgrader/streams/core/435c62c3-2e7531a2.patch.sql 1 addition, 0 deletionsinclude/upgrader/streams/core/435c62c3-2e7531a2.patch.sql
- include/upgrader/streams/core/c00511c7-7be60a84.patch.sql 2 additions, 0 deletionsinclude/upgrader/streams/core/c00511c7-7be60a84.patch.sql
- include/upgrader/streams/core/d0e37dca-1da1bcba.patch.sql 4 additions, 2 deletionsinclude/upgrader/streams/core/d0e37dca-1da1bcba.patch.sql
- scp/autocron.php 16 additions, 7 deletionsscp/autocron.php
- scp/emailtest.php 4 additions, 3 deletionsscp/emailtest.php
Loading
Please register or sign in to comment