Merge remote branch 'upstream/develop-next' into develop-next
Conflicts: .gitignore
Showing
- .gitignore 1 addition, 1 deletion.gitignore
- assets/default/css/theme.css 2 additions, 2 deletionsassets/default/css/theme.css
- include/class.auth.php 3 additions, 3 deletionsinclude/class.auth.php
- include/class.client.php 4 additions, 0 deletionsinclude/class.client.php
- include/class.export.php 53 additions, 19 deletionsinclude/class.export.php
- include/class.ostsession.php 4 additions, 2 deletionsinclude/class.ostsession.php
- include/client/header.inc.php 3 additions, 1 deletioninclude/client/header.inc.php
- include/client/view.inc.php 7 additions, 5 deletionsinclude/client/view.inc.php
- include/i18n/en_US/form.yaml 6 additions, 3 deletionsinclude/i18n/en_US/form.yaml
- include/mysqli.php 15 additions, 4 deletionsinclude/mysqli.php
- include/pear/Mail/RFC822.php 7 additions, 3 deletionsinclude/pear/Mail/RFC822.php
- include/staff/templates/org.tmpl.php 3 additions, 2 deletionsinclude/staff/templates/org.tmpl.php
- include/staff/ticket-view.inc.php 4 additions, 4 deletionsinclude/staff/ticket-view.inc.php
- include/staff/user-view.inc.php 2 additions, 2 deletionsinclude/staff/user-view.inc.php
- js/osticket.js 1 addition, 1 deletionjs/osticket.js
- js/redactor-osticket.js 1 addition, 1 deletionjs/redactor-osticket.js
- setup/cli/modules/export.php 50 additions, 8 deletionssetup/cli/modules/export.php
- setup/cli/modules/file.php 113 additions, 4 deletionssetup/cli/modules/file.php
- setup/cli/modules/import.php 111 additions, 30 deletionssetup/cli/modules/import.php
- setup/inc/class.installer.php 6 additions, 6 deletionssetup/inc/class.installer.php
Loading
Please register or sign in to comment