Conflicts:
	include/ajax.config.php
	include/ajax.content.php
	include/class.dynamic_forms.php
	include/class.export.php
	include/class.filter.php
	include/class.mailer.php
	include/class.nav.php
	include/class.orm.php
	include/class.page.php
	include/class.thread.php
	include/class.ticket.php
	include/client/open.inc.php
	include/staff/departments.inc.php
	include/staff/faq.inc.php
	include/staff/settings-access.inc.php
	include/staff/templates/content-manage.tmpl.php
	include/staff/ticket-open.inc.php
	include/staff/tickets.inc.php
	include/staff/user-view.inc.php

queue: Make sorting options relevant to the current queue

Reviewed-By: Peter Rotich <peter@osticket.com>

Permissions for users, orgs, and searches

Reviewed-By: Peter Rotich <peter@osticket.com>

cli: user: Add list, activate, lock features

Reviewed-By: Peter Rotich <peter@osticket.com>

search: Fix search for unassigned tickets

Reviewed-By: Peter Rotich <peter@osticket.com>

forms: Fix unset of all checkboxes on a form

Reviewed-By: Peter Rotich <peter@osticket.com>

bug: Support quick user id filtering

Reviewed-By: Jared Hancock <jared@osticket.com>

collabs: Skip activity notice if collabs included in Cc header

Reviewed-By: Peter Rotich <peter@osticket.com>

alerts: Consider "alert assigned on new message"

Reviewed-By: Peter Rotich <peter@osticket.com>

i18n: Automate dns signature publishing for language packs

Reviewed-By: Peter Rotich <peter@osticket.com>

forms: Add Textbox Selection Widget

Reviewed-By: Jared Hancock <jared@osticket.com>

csv: Add UTF-8 BOM to export file

Reviewed-By: Peter Rotich <peter@osticket.com>

faq: Show proper internal/public category in drop-down

Reviewed-By: Peter Rotich <peter@osticket.com>

dashboard: Fix initial page load and stats pagination

Reviewed-By: Peter Rotich <peter@osticket.com>

kb: Add setting to enable only for authenticated clients

Review-By: Peter Rotich <peter@osticket.com>

search: Fix search on create date

Upgrader done.inc.php: scp/settings.php not working

Reviewed-By: Jared Hancock <jared@osticket.com>

Clear overdue on close

Reviewed-By: Jared Hancock <jared@osticket.com>

oops: Fix dropped custom data from API requests

Reviewed-By: Peter Rotich <peter@osticket.com>

filter: Trim match values when saving rules

Reviewed-By: Peter Rotich <peter@osticket.com>

Fixed typo

cdata: Drop ticket cdata on delete

Reviewed-By: Peter Rotich <peter@osticket.com>

files: Clear attachment box after posting a response

Reviewed-By: Peter Rotich <peter@osticket.com>

thread: Log remote IP for staff replies and notes

Reviewed-By: Peter Rotich <peter@osticket.com>

oops: Fix ticket export to CSV

Reviewed-By: Peter Rotich <peter@osticket.com>

oops: Allow the ticket lock feature to be disabled

Reviewed-By: Peter Rotich <peter@osticket.com>

This fixes a slight regression, where, if the locking mechanism were
disabled, then tickets could no longer be responded to.

Support filtering search results by uid.