Merge remote branch 'adriane/issues/misc-fixes' into develop-next (6d542f22) · 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

6d542f22

Commit 6d542f22 authored 7 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'adriane/issues/misc-fixes' into develop-next

parents 75a510d0 24dc24db

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.thread.php 10 additions, 10 deletions

include/ajax.thread.php
include/class.filter.php 32 additions, 21 deletions

include/class.filter.php
include/class.report.php 1 addition, 1 deletion

include/class.report.php
include/class.thread.php 18 additions, 2 deletions

include/class.thread.php
include/class.ticket.php 25 additions, 21 deletions

include/class.ticket.php
include/class.user.php 10 additions, 0 deletions

include/class.user.php
include/client/templates/thread-entry.tmpl.php 6 additions, 5 deletions

include/client/templates/thread-entry.tmpl.php
include/staff/filter.inc.php 3 additions, 4 deletions

include/staff/filter.inc.php
include/staff/templates/collaborators.tmpl.php 1 addition, 1 deletion

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

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

scp/ajax.php
scp/filters.php 3 additions, 2 deletions

scp/filters.php

with 112 additions and 70 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