Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

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

Snippets Groups Projects

35b260f9

Commit 35b260f9 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'upstream/develop-next' into develop-next

parents 44006c7b 27b2b080

Branches

Tags

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.admin.php 3 additions, 0 deletions

include/ajax.admin.php
include/api.tickets.php 6 additions, 1 deletion

include/api.tickets.php
include/class.search.php 1 addition, 1 deletion

include/class.search.php
include/class.staff.php 16 additions, 5 deletions

include/class.staff.php
include/staff/templates/queue-sorting.tmpl.php 1 addition, 1 deletion

include/staff/templates/queue-sorting.tmpl.php
include/staff/templates/queue-tickets.tmpl.php 5 additions, 1 deletion

include/staff/templates/queue-tickets.tmpl.php

with 32 additions and 9 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