Mike Koch 4173c366e6 Merge branch 'master' into tiny-mce-for-tickets ...

# Conflicts:
#	admin/admin_settings.php
#	admin/admin_settings_save.php
#	language/en/text.php
#	modsForHesk_settings.inc.php

2015-08-02 16:20:10 -04:00

..

admin_main.php

#209 Everything uses the new status_functions

2015-07-30 12:35:30 -04:00

admin_reply_ticket.php

#208 Fix rendering of HTML and for signatures

2015-07-09 22:13:16 -04:00

admin_settings_save.php

Merge branch 'master' into tiny-mce-for-tickets

2015-08-02 16:20:10 -04:00

admin_settings.php

Merge branch 'master' into tiny-mce-for-tickets

2015-08-02 16:20:10 -04:00

admin_submit_ticket.php

#208 Fix rendering of HTML and for signatures

2015-07-09 22:13:16 -04:00

admin_ticket.php

Merge branch 'master' into tiny-mce-for-tickets

2015-08-02 16:20:10 -04:00

banned_emails.php

#255 Update headers

2015-06-23 23:33:03 -04:00

banned_ips.php

#255 Update headers

2015-06-23 23:33:03 -04:00

change_status.php

#209 Support new status table

2015-07-28 12:52:30 -04:00

delete_tickets.php

#255 Update headers

2015-06-23 23:33:03 -04:00

edit_note.php

#255 Update headers

2015-06-23 23:33:03 -04:00

edit_post.php

#208 Add TinyMCE to client side and fix edit post for admin

2015-07-14 22:21:28 -04:00

export.php

#209 Everything uses the new status_functions

2015-07-30 12:35:30 -04:00

find_tickets.php

#255 Update headers

2015-06-23 23:33:03 -04:00

index.php

#255 Update headers

2015-06-23 23:33:03 -04:00

knowledgebase_private.php

#255 Update headers

2015-06-23 23:33:03 -04:00

lock.php

#255 Update headers

2015-06-23 23:33:03 -04:00

mail.php

#255 Update headers

2015-06-23 23:33:03 -04:00

manage_canned.php

Merge branch 'master' into tiny-mce-for-tickets

2015-08-02 16:20:10 -04:00

manage_categories.php

#274 Add category sort property for dropdowns and table

2015-07-03 22:23:09 -04:00

manage_email_templates.php

Fix permission name for email templates, add other two tools to navbar check

2015-05-13 17:57:08 -04:00

manage_knowledgebase.php

Closes #259 Hopefully fixed the footer...again

2015-06-27 21:34:18 -04:00

manage_permission_templates.php

#274 Add category sort property for dropdowns and table

2015-07-03 22:23:09 -04:00

manage_statuses.php

#209 Everything uses the new status_functions

2015-07-30 12:35:30 -04:00

manage_ticket_templates.php

#202 Add TinyMCE to ticket template page

2015-07-30 13:00:53 -04:00

manage_users.php

#274 Add category sort property for dropdowns and table

2015-07-03 22:23:09 -04:00

new_ticket.php

#208 Don't use TinyMCE for custom fields

2015-07-09 21:48:06 -04:00

options.php

#255 Update headers

2015-06-23 23:33:03 -04:00

password.php

#255 Update headers

2015-06-23 23:33:03 -04:00

profile.php

#255 Update headers

2015-06-23 23:33:03 -04:00

reports.php

#255 Update headers

2015-06-23 23:33:03 -04:00

service_messages.php

#255 Update headers

2015-06-23 23:33:03 -04:00

show_tickets.php

#209 Everything uses the new status_functions

2015-07-30 12:35:30 -04:00