Merge remote-tracking branch 'jared/feature/messages-single-table' into feature/advanced-search (4feeb822) · 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

4feeb822

Commit 4feeb822 authored 12 years ago by Peter Rotich

Downloads
- Plain Diff

Merge remote-tracking branch 'jared/feature/messages-single-table' into feature/advanced-search

parents ce4e58d8 82eeb90c

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

include/class.ticket.php 68 additions, 43 deletions

include/class.ticket.php
include/client/tickets.inc.php 3 additions, 4 deletions

include/client/tickets.inc.php
include/client/view.inc.php 5 additions, 5 deletions

include/client/view.inc.php
include/staff/ticket-view.inc.php 8 additions, 8 deletions

include/staff/ticket-view.inc.php
include/staff/tickets.inc.php 16 additions, 17 deletions

include/staff/tickets.inc.php
main.inc.php 1 addition, 3 deletions

main.inc.php
setup/inc/class.setup.php 3 additions, 2 deletions

setup/inc/class.setup.php
setup/inc/sql/f8856d56-abe9c0cb.patch.sql 109 additions, 0 deletions

setup/inc/sql/f8856d56-abe9c0cb.patch.sql
setup/inc/sql/osticket-v1.7-mysql.sql 20 additions, 42 deletions

setup/inc/sql/osticket-v1.7-mysql.sql
setup/inc/sql/osticket-v1.7-mysql.sql.md5 1 addition, 1 deletion

setup/inc/sql/osticket-v1.7-mysql.sql.md5

with 234 additions and 125 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