Merge remote branch 'upstream/develop-next' into 1.11.x (31c129a2) · 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

31c129a2

Commit 31c129a2 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote branch 'upstream/develop-next' into 1.11.x

parents a5240d84 c0baa320

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

include/ajax.tickets.php 64 additions, 0 deletions

include/ajax.tickets.php
include/class.file.php 12 additions, 0 deletions

include/class.file.php
include/class.forms.php 43 additions, 0 deletions

include/class.forms.php
include/class.thread.php 19 additions, 0 deletions

include/class.thread.php
include/client/templates/thread-export.tmpl.php 93 additions, 0 deletions

include/client/templates/thread-export.tmpl.php
include/staff/templates/mark-as.tmpl.php 57 additions, 0 deletions

include/staff/templates/mark-as.tmpl.php
include/staff/ticket-view.inc.php 10 additions, 2 deletions

include/staff/ticket-view.inc.php
scp/ajax.php 1 addition, 0 deletions

scp/ajax.php
scp/tickets.php 3 additions, 24 deletions

scp/tickets.php

with 302 additions and 26 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