Merge branch 'develop' into develop-next (2f7ab755) · Commits · docker / osticket · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

osticket
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

2f7ab755

Commit 2f7ab755 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop' into develop-next

Conflicts:
	include/class.forms.php
	scp/js/scp.js

parents cd7255d1 cd104aac

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

include/class.forms.php 22 additions, 14 deletions

include/class.forms.php
include/staff/tasks.inc.php 5 additions, 0 deletions

include/staff/tasks.inc.php
include/staff/templates/status-options.tmpl.php 1 addition, 0 deletions

include/staff/templates/status-options.tmpl.php
include/staff/templates/tickets-actions.tmpl.php 1 addition, 0 deletions

include/staff/templates/tickets-actions.tmpl.php
include/staff/ticket-view.inc.php 1 addition, 1 deletion

include/staff/ticket-view.inc.php
js/osticket.js 3 additions, 0 deletions

js/osticket.js
scp/forms.php 1 addition, 0 deletions

scp/forms.php
scp/js/scp.js 5 additions, 1 deletion

scp/js/scp.js

with 39 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment