queues: Column Conditions Overwrite

queues: Row Conditions

This addresses an issue where row conditions are working in the preview but
not in the actual ticket queue. This updates the `getQueue()` function to
lookup the CustomQueue by `queue_id` if there is no CustomQueue object found
in the QueueColumn.

tests: Git Conflict Markers

issue: Ticket Filter Does Not Match Regex

perms: Alphabetize Role/Staff Permissions

issue: Wrong Attachment Names

issue: Old Attachment Names

This addresses an issue where Column Conditions are not overwriting the Row
Conditions. This changes the order of `array_merge()` to make Column
Conditions overwrite the Row Conditions.

This alphabetizes all Role and Staff Permissions.

This addresses an issue reported on the forums where the ticket filter Rule
option of “Does Not Match Regex” isn’t working properly; instead it works in
reverse.

issue: FAQ & Canned Attachments Dropping

Task Assigned Team Issue:

This addresses an issue where it appeared as though tasks could not be assigned to teams if an agent in the team was not a part of the task's department. The assigment was actually taking place, however, it was not showing up in the Assignee column. Now the form will correctly display the column

This addresses an issue where FAQ & Canned Response attachments are dropping
when another agent edits the FAQ or Canned Response.

This addresses an issue where uploading a file you’ve uploaded before but
renamed is not saving the new name in the Attachment table.

Search All Tickets Setting

This addresses an issue where FileUploadFields are displaying the old names
of existing files with new names.

If an Agent has the Miscellaneous setting checked to see all Tickets in search results, they should be able to see the list of Tickets regardless of their access or if the search is saved or not. They should NOT, however, be able to view those Tickets.

Advanced Search: TicketStatus / Status Name

This commit adds 'TicketStatus / Status Name' to the main search criteria list for advanced searching.

Retain old search criteria when isolate fails. This provide for ability to
fix issues with isolation post-upgrade.

Implement 'Select Active Collaborators':

- Enable/Disable Collaborators based on which Collaborators are in the 'Select Active Collaborators' box

issue: Canned Resp Select2 Width

This enhances the Select2 canned response box by making it wider, showing
more text in each line.

issue: Featured FAQs On Disable

This addresses an issue where the client portal shows Featured FAQs on the
sidebar even thought the Knowledgebase is Disabled.

Team Referral Check

Referral Assignment Issue:

This commit adds an additional check for Team referrals in the isReferred method so that it is handled in the same way Staff and Departments are handled.

This commit fixes an issue where referrals were being considered successfully saved even if that referral already existed, resulting in multiple thread events for the same referral.

Instead, if we find that the thread is already referred to the referee, refer should return false so that an error message is displayed stating that we were unable to refer the ticket.

issue: Deleted Field Thread Events (template)

canned: Canned Response Select2 Height