Merge remote branch 'peter/issue/collaborators' into develop-next (0e078fdd) · 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

0e078fdd

Commit 0e078fdd authored 11 years ago by Jared Hancock

Downloads
- Plain Diff

Merge remote branch 'peter/issue/collaborators' into develop-next


Reviewed-By: Jared Hancock <jared@osticket.com>

parents 67bcfaa0 2d35033c

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.tickets.php 23 additions, 1 deletion

include/ajax.tickets.php
include/class.collaborator.php 14 additions, 0 deletions

include/class.collaborator.php
include/class.ticket.php 31 additions, 21 deletions

include/class.ticket.php
include/staff/templates/collaborators-preview.tmpl.php 28 additions, 0 deletions

include/staff/templates/collaborators-preview.tmpl.php
include/staff/ticket-view.inc.php 9 additions, 8 deletions

include/staff/ticket-view.inc.php
scp/ajax.php 2 additions, 1 deletion

scp/ajax.php
scp/js/ticket.js 1 addition, 0 deletions

scp/js/ticket.js
scp/js/tips.js 22 additions, 0 deletions

scp/js/tips.js

with 130 additions and 31 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