Mike Koch 65452902bb Merge remote-tracking branch 'origin/master' into 2-6-0 ...

Conflicts:
	admin/manage_knowledgebase.php
	inc/header.inc.php
	inc/headerAdmin.inc.php
	install/mods-for-hesk/sql/installSql.php

2016-05-04 23:42:53 -04:00

..

admin_main.php

Update headers

2016-04-18 18:57:07 -04:00

admin_reply_ticket.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

admin_settings_save.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

admin_settings.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

admin_submit_ticket.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

admin_ticket.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

api_settings.php

Tokens can now be reset

2015-11-19 21:14:15 -05:00

assign_owner.php

#253 Fix indentation across the project

2015-09-12 00:46:46 -04:00

banned_emails.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

banned_ips.php

Update headers

2016-04-18 18:57:07 -04:00

calendar.php

Some calendar fixes

2016-04-26 08:59:54 -04:00

change_status.php

Update headers

2016-04-18 18:57:07 -04:00

delete_tickets.php

Update headers

2016-04-18 18:57:07 -04:00

edit_note.php

Update headers

2016-04-18 18:57:07 -04:00

edit_post.php

Update headers

2016-04-18 18:57:07 -04:00

export.php

Update headers

2016-04-18 18:57:07 -04:00

find_tickets.php

Update headers

2016-04-18 18:57:07 -04:00

index.php

Update headers

2016-04-18 18:57:07 -04:00

knowledgebase_private.php

Update headers

2016-04-18 18:57:07 -04:00

lock.php

Update headers

2016-04-18 18:57:07 -04:00

mail.php

Update mail.php

2016-04-18 18:27:27 -04:00

manage_canned.php

Update headers

2016-04-18 18:57:07 -04:00

manage_categories.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

manage_email_templates.php

#392 Add constants for all items for admin nav

2015-10-27 18:37:58 -04:00

manage_knowledgebase.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

manage_permission_templates.php

Update headers

2016-04-18 18:57:07 -04:00

manage_statuses.php

Add colorpicker for categories and statuses

2016-04-30 21:17:30 -04:00

manage_ticket_templates.php

Update headers

2016-04-18 18:57:07 -04:00

manage_users.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

move_category.php

#253 Fix indentation across the project

2015-09-12 00:46:46 -04:00

new_ticket.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

options.php

Update headers

2016-04-18 18:57:07 -04:00

password.php

Update headers

2016-04-18 18:57:07 -04:00

profile.php

Merge remote-tracking branch 'origin/master' into 2-6-0

2016-05-04 23:42:53 -04:00

reports.php

Update headers

2016-04-18 18:57:07 -04:00

service_messages.php

Update headers

2016-04-18 18:57:07 -04:00

show_tickets.php

Update headers

2016-04-18 18:57:07 -04:00

view_message_log.php

Some improvments

2015-12-10 22:15:32 -05:00