Merge branch 'feature/inline_notes' into develop (f2dd592e) · 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

f2dd592e

Commit f2dd592e authored 12 years ago by Peter Rotich

Downloads
- Plain Diff

Merge branch 'feature/inline_notes' into develop

parents 76525b0e d452a186

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

assets/default/css/theme.css 7 additions, 0 deletions

assets/default/css/theme.css
include/class.config.php 5 additions, 0 deletions

include/class.config.php
include/class.ticket.php 50 additions, 51 deletions

include/class.ticket.php
include/client/view.inc.php 14 additions, 35 deletions

include/client/view.inc.php
include/staff/settings-tickets.inc.php 146 additions, 138 deletions

include/staff/settings-tickets.inc.php
include/staff/ticket-view.inc.php 31 additions, 34 deletions

include/staff/ticket-view.inc.php
main.inc.php 1 addition, 1 deletion

main.inc.php
scp/css/scp.css 22 additions, 38 deletions

scp/css/scp.css
scp/js/ticket.js 1 addition, 1 deletion

scp/js/ticket.js
setup/inc/sql/49478749-c2d2fabf.patch.sql 2 additions, 0 deletions

setup/inc/sql/49478749-c2d2fabf.patch.sql
setup/inc/sql/osticket-v1.7-mysql.sql 2 additions, 1 deletion

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
tickets.php 1 addition, 3 deletions

tickets.php

with 283 additions and 303 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