adding missing migration
Merge pull request #137 from brente/master

Fix for ticket list sorting and pagination
fixing frozen model in migration 0005 to add field added in 0004
adding conditional migration
merge branch master
Merge branch 'master' of github.com:Lacrymology/django-helpdesk
fix conflicts with master
Merge branch 'conditional-tags'
Merge pull request #139 from Lacrymology/master

Conditional tag field has problems with migrations. Fixes #126.
use more flexible way to get the id of the <div>
this let use of more complex widget than a simple <input> in <div> child
Merge pull request #144 from bclermont/patch-1

use more flexible way to get the id of the <div>
Add more detail on contrib.markup to docs. Closes #141.
Updated SQLite check due to changed Django DB definitions. Fixes #143.
fix the search for the cases where user search with email address like : no-reply@tigers-connect.com
Update helpdesk/views/staff.py
Merge pull request #154 from satyans24/master

2- fixes, 1 - fixed issue when user search with email address like : no-reply@tigers-connect.com
Unable to accept resolution of unassigned tickets
Merge branch 'master' of github.com:rossp/django-helpdesk
RSS feeds not working for users with periods in their name. Fixes issue #30, thanks @tsanecki
Make login link go to the users preferred dashboard/ticket list. Fixes #97, thanks @emperorcezar