Merge branch 'develop-next' into 1.11.x (d973abd2) · 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

d973abd2

Commit d973abd2 authored 6 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'develop-next' into 1.11.x

parents b7339959 c13f6230

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

include/class.mailer.php 3 additions, 0 deletions

include/class.mailer.php
include/class.queue.php 1 addition, 1 deletion

include/class.queue.php
include/class.search.php 36 additions, 13 deletions

include/class.search.php
include/class.ticket.php 3 additions, 0 deletions

include/class.ticket.php
include/client/templates/thread-entries.tmpl.php 2 additions, 0 deletions

include/client/templates/thread-entries.tmpl.php
include/client/tickets.inc.php 5 additions, 5 deletions

include/client/tickets.inc.php
include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php 24 additions, 3 deletions

include/upgrader/streams/core/934b8db8-ad9d0a5f.task.php
js/redactor-osticket.js 19 additions, 3 deletions

js/redactor-osticket.js
scp/js/scp.js 2 additions, 1 deletion

scp/js/scp.js

with 95 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