Alex Seeholzer f7f0882f86 Merge branch 'master-upstream' into django-1.9-fixes ... * master-upstream: Fix QueueMembership bug revealed by django.test's DiscoverRunner		2015-11-18 10:16:33 +01:00
..
fixtures	Rename initial_data.json to emailtemplate.json	2015-01-14 15:49:08 +01:00
locale	Update French translations. Thanks to @tonioo; closes #259.	2014-09-18 09:50:18 +10:00
management	Modify make_option with dest variable 'escalate-verbosely'	2015-06-17 16:22:44 +02:00
migrations	bugfix: migration dependency corrected	2015-11-13 16:03:13 +01:00
south_migrations	Added south migration to populate the initially existing users with usersettings.	2015-02-11 13:14:36 +01:00
static/helpdesk	Merge branch 'master' into template-cleanup	2014-07-26 14:03:08 +02:00
templates/helpdesk	deprecated tags replaced in django 1.9 (ssi and url template tags are removed from the future template tag library)	2015-11-16 16:09:47 +01:00
templatetags	Fix exeception for templetags (works on django 1.7/py3.4 & django 1.6/py2.7)	2015-04-28 14:50:49 +02:00
tests	Merge branch 'master-upstream' into django-1.9-fixes	2015-11-18 10:16:33 +01:00
views	Fix QueueMembership bug revealed by django.test's DiscoverRunner	2015-11-16 18:45:27 +07:00
__init__.py	Revert "Make sure custom user logic works with Django 1.4"	2014-10-24 18:05:44 +11:00
admin.py	Add ability to restrict users' access by queue if so configured, and migration and tests for same.	2015-06-12 12:23:39 +07:00
akismet.py	small fixes and translation	2011-09-01 13:01:03 +02:00
apps.py	Fixes for Django 1.7. For prior Django versions, South 1.0 must be used for	2014-09-10 09:06:50 +10:00
forms.py	Merge	2015-04-28 09:13:54 +10:00
lib.py	downwards compatibility for django < 1.8	2015-11-13 15:36:04 +01:00
models.py	Add ability to restrict users' access by queue if so configured, and migration and tests for same.	2015-06-12 12:23:39 +07:00
poll_helpdesk_email_queues.sh	Closes #161 - provide script to simplify automation of email polling	2013-01-20 14:40:57 +11:00
settings.py	Add ability to restrict users' access by queue if so configured, and migration and tests for same.	2015-06-12 12:23:39 +07:00
urls.py	Merge commit '21e46f010dfecea1562a4d2b308fd78b71fec8a0' into no-admin-url	2014-07-21 21:38:40 +02:00