From 266775dbf63fbf373d98fe670719e21755849e10 Mon Sep 17 00:00:00 2001 From: Mike Hoolehan <mike@hoolehan.com> Date: Wed, 18 Mar 2020 09:11:48 +0200 Subject: [PATCH 1/4] Update get_email.py --- helpdesk/management/commands/get_email.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 273b7fd5..ad127e78 100755 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -551,7 +551,7 @@ def ticket_from_message(message, queue, logger): # copy email to all those CC'd to this particular ticket for cc in t.ticketcc_set.all(): # don't duplicate email to assignee - if t.assigned_to.email != cc.email_address: + if not t.assigned_to or (t.assigned_to.email != cc.email_address): send_templated_mail( 'updated_cc', context, From c71d8879ecfe62d83769bc57cdd665f2a081af24 Mon Sep 17 00:00:00 2001 From: Garret Wassermann <gwasser@gmail.com> Date: Wed, 15 Apr 2020 05:17:08 -0400 Subject: [PATCH 2/4] Update copyright year in README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 53b576dc..686d9db4 100644 --- a/README.rst +++ b/README.rst @@ -7,7 +7,7 @@ django-helpdesk - A Django powered ticket tracker for small businesses. .. image:: https://codecov.io/gh/django-helpdesk/django-helpdesk/branch/master/graph/badge.svg :target: https://codecov.io/gh/django-helpdesk/django-helpdesk -Copyright 2009-2019 Ross Poulton and django-helpdesk contributors. All Rights Reserved. +Copyright 2009-2020 Ross Poulton and django-helpdesk contributors. All Rights Reserved. See LICENSE for details. django-helpdesk was formerly known as Jutda Helpdesk, named after the From 20f99484ea128fa5d6765f5ffc413293672d225d Mon Sep 17 00:00:00 2001 From: Garret Wassermann <gwasser@gmail.com> Date: Wed, 15 Apr 2020 05:18:37 -0400 Subject: [PATCH 3/4] Update quicktest configuration for Python 2 tests, to address #813 --- quicktest.py | 1 + 1 file changed, 1 insertion(+) diff --git a/quicktest.py b/quicktest.py index 371696fb..33e09e6f 100644 --- a/quicktest.py +++ b/quicktest.py @@ -68,6 +68,7 @@ class QuickDjangoTest(object): settings.configure( DEBUG=True, + TIME_ZONE='UTC', DATABASES={ 'default': { 'ENGINE': 'django.db.backends.sqlite3', From a6f75ada9cb02847a1700506be7e606ad34e4e22 Mon Sep 17 00:00:00 2001 From: Garret Wassermann <gwasser@gmail.com> Date: Wed, 15 Apr 2020 05:39:27 -0400 Subject: [PATCH 4/4] Update to 0.2.20 --- demo/setup.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/demo/setup.py b/demo/setup.py index a4e66264..163d2e66 100644 --- a/demo/setup.py +++ b/demo/setup.py @@ -13,7 +13,7 @@ project_root = os.path.dirname(here) NAME = 'django-helpdesk-demodesk' DESCRIPTION = 'A demo Django project using django-helpdesk' README = open(os.path.join(here, 'README.rst')).read() -VERSION = '0.2.19' +VERSION = '0.2.20' #VERSION = open(os.path.join(project_root, 'VERSION')).read().strip() AUTHOR = 'django-helpdesk team' URL = 'https://github.com/django-helpdesk/django-helpdesk' diff --git a/setup.py b/setup.py index f285ca73..89162afa 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from distutils.util import convert_path from fnmatch import fnmatchcase from setuptools import setup, find_packages -version = '0.2.19' +version = '0.2.20' # Provided as an attribute, so you can append to these instead # of replicating them: