Mike Koch de5a568cd2 Merge remote-tracking branch 'origin/master' into move-settings-to-db ...

# Conflicts:
#	install/mods-for-hesk/sql/installSql.php

2015-09-03 22:01:38 -04:00

..

admin_main.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

admin_reply_ticket.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

admin_settings_save.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

admin_settings.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

admin_submit_ticket.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

admin_ticket.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

assign_owner.php

#327 Settings are finally all driven through the database

2015-09-03 21:58:05 -04:00

banned_emails.php

#331 Update headers

2015-08-29 21:44:26 -04:00

banned_ips.php

#331 Update headers

2015-08-29 21:44:26 -04:00

change_status.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

delete_tickets.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

edit_note.php

#331 Update headers

2015-08-29 21:44:26 -04:00

edit_post.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

export.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

find_tickets.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

index.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

knowledgebase_private.php

#331 Update headers

2015-08-29 21:44:26 -04:00

lock.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

mail.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

manage_canned.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

manage_categories.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -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

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

manage_permission_templates.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

manage_statuses.php

#327 Settings are finally all driven through the database

2015-09-03 21:58:05 -04:00

manage_ticket_templates.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

manage_users.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

move_category.php

#327 Settings are finally all driven through the database

2015-09-03 21:58:05 -04:00

new_ticket.php

Merge pull request #335 from mkoch227/fix-canned-templates-and-responses

2015-08-30 22:00:02 -04:00

options.php

#331 Update headers

2015-08-29 21:44:26 -04:00

password.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00

profile.php

#331 Update headers

2015-08-29 21:44:26 -04:00

reports.php

#331 Update headers

2015-08-29 21:44:26 -04:00

service_messages.php

#331 Update headers

2015-08-29 21:44:26 -04:00

show_tickets.php

Merge remote-tracking branch 'origin/master' into move-settings-to-db

2015-09-03 22:01:38 -04:00