Garret Wassermann 31b49ab2f6 Merge branch 'master' into develop

2017-12-28 09:32:14 -05:00

..

fixtures

fix typo in new chinese support in emailtemplate, demo is ready at helpdesk.pengel.cn

2017-12-11 15:53:43 +08:00

locale

add translation for chinese, zh_Hans is the new locale support code for django

2017-12-09 18:52:39 +08:00

management

Address deprecation warnings to be compatible with Django 2.0

2017-12-28 07:23:51 -05:00

migrations

Address deprecation warnings to be compatible with Django 2.0

2017-12-28 07:23:51 -05:00

static/helpdesk

Fix collectstatic errors, as reported in #479

2017-12-28 06:04:05 -05:00

templates/helpdesk

Merge 0.2.4 bugfixes

2017-12-18 00:45:36 -05:00

templatetags

Merge 0.2.6 Django 2.0 updates

2017-12-28 09:16:01 -05:00

tests

Merge branch 'master' into develop

2017-12-28 09:32:14 -05:00

views

Merge 0.2.6 Django 2.0 updates

2017-12-28 09:16:01 -05:00

__init__.py

Revert "Make sure custom user logic works with Django 1.4"

2014-10-24 18:05:44 +11:00

admin.py

Enhancements to Admin (#524)

2017-06-19 14:34:36 -04:00

akismet.py

fixing RST syntax for docstring on akismet.py

2016-10-26 10:22:15 +02:00

apps.py

Initial general clean-up of stuff

2016-10-21 17:14:12 +02:00

decorators.py

Merge 0.2.6 Django 2.0 updates

2017-12-28 09:16:01 -05:00

forms.py

Bump version to 0.2.6 to fix remaining Django 2.0 warnings

2017-12-28 09:11:34 -05:00

lib.py

Merge 0.2.4 bugfixes

2017-12-18 00:45:36 -05:00

models.py

Merge 0.2.6 Django 2.0 updates

2017-12-28 09:16:01 -05: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

Merge 0.2.4 bugfixes

2017-12-18 00:45:36 -05:00

urls.py

Fix PEP8 errors detected by new pycodestyle script

2017-12-06 02:06:07 -05:00