From e1e05999eb92b44f43e8c6760a0f95a16a0ced51 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Thu, 25 Jul 2019 12:43:29 -0400 Subject: [PATCH 1/4] #767, fix a misspelled urL in emailtemplate.json --- helpdesk/fixtures/emailtemplate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helpdesk/fixtures/emailtemplate.json b/helpdesk/fixtures/emailtemplate.json index 0626e719..183fdea7 100644 --- a/helpdesk/fixtures/emailtemplate.json +++ b/helpdesk/fixtures/emailtemplate.json @@ -378,7 +378,7 @@ "heading" : "К Вашей заявке добавлен новый комментарий", "subject" : " ", "template_name" : "updated_submitter", - "html" : "

Здравствуйте,

\r\n\r\n

Вами была оставлена заявка {{ ticket.title }} Советуем Вам прокомментировать эту заявку.

\r\n\r\n

Следующий комментарий был добавлен к заявке{{ ticket.ticket }}:

\r\n\r\n
{{ comment }}
\r\n\r\n

Если Вы хотите сообщить нам дополнительную информацию, пожалуйста ответьте на это письмо. Или же Вы можете сделать это, оставив комментарий к своей заявке. Перейти к заявке{{ ticket.ticket_url }}.

" + "html" : "

Здравствуйте,

\r\n\r\n

Вами была оставлена заявка {{ ticket.title }} Советуем Вам прокомментировать эту заявку.

\r\n\r\n

Следующий комментарий был добавлен к заявке{{ ticket.ticket }}:

\r\n\r\n
{{ comment }}
\r\n\r\n

Если Вы хотите сообщить нам дополнительную информацию, пожалуйста ответьте на это письмо. Или же Вы можете сделать это, оставив комментарий к своей заявке. Перейти к заявке{{ ticket.ticket_url }}.

" }, "pk" : 32, "model" : "helpdesk.emailtemplate" From 62fbee205c22ffcfe5af02440ad7a945fa38bd0f Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Mon, 5 Aug 2019 18:41:31 -0400 Subject: [PATCH 2/4] Adjusted get_email management command to support custom User model --- helpdesk/management/commands/get_email.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helpdesk/management/commands/get_email.py b/helpdesk/management/commands/get_email.py index 0e649dcf..273b7fd5 100755 --- a/helpdesk/management/commands/get_email.py +++ b/helpdesk/management/commands/get_email.py @@ -31,6 +31,8 @@ from bs4 import BeautifulSoup from email_reply_parser import EmailReplyParser + +from django.contrib.auth import get_user_model from django.core.files.base import ContentFile from django.core.files.uploadedfile import SimpleUploadedFile from django.core.management.base import BaseCommand @@ -41,10 +43,11 @@ from django.utils import encoding, six, timezone from helpdesk import settings from helpdesk.lib import send_templated_mail, safe_template_context, process_attachments from helpdesk.models import Queue, Ticket, TicketCC, FollowUp, IgnoreEmail -from django.contrib.auth.models import User import logging +User = get_user_model() + STRIPPED_SUBJECT_STRINGS = [ "Re: ", From d896e21fd29341cc5b881c03b83bf1b5d6636559 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 5 Aug 2019 19:22:08 -0400 Subject: [PATCH 3/4] Use ubuntu bionic 18.04 for automated testing --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index caeaab63..ff819798 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,15 @@ language: python +dist: bionic # use LTS 18.04 python: - "2.7" - "3.4" - "3.5" - "3.6" + - "3.7" env: - - DJANGO=1.11.13 + - DJANGO=1.11.23 install: - pip install -q Django==$DJANGO From b41f95fd7e715b756cf456315bf9ad143da8fe97 Mon Sep 17 00:00:00 2001 From: Garret Wassermann Date: Mon, 5 Aug 2019 19:29:14 -0400 Subject: [PATCH 4/4] Drop support for python 3.4 and 3.5, since they're now unsupported too anyway --- .travis.yml | 2 -- README.rst | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff819798..8bf67021 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,6 @@ dist: bionic # use LTS 18.04 python: - "2.7" - - "3.4" - - "3.5" - "3.6" - "3.7" diff --git a/README.rst b/README.rst index e93c933a..53b576dc 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-2018 Ross Poulton and django-helpdesk contributors. All Rights Reserved. +Copyright 2009-2019 Ross Poulton and django-helpdesk contributors. All Rights Reserved. See LICENSE for details. django-helpdesk was formerly known as Jutda Helpdesk, named after the @@ -63,10 +63,10 @@ Installation `django-helpdesk` requires: * Django 1.11.x -* either Python 2.7 or 3.4+ +* either Python 2.7 or 3.6+ (likely 3.4+ still works though, but unsupported) **NOTE REGARDING PYTHON VERSION:** -The recommended combination is Python 3.4+ with Django 1.11. +The recommended combination is Python 3.6+ with Django 1.11. Support for Python 2 will end in the next versions of both `django-helpdesk` and Django itself (Django 2.0), so users and developers are encouraged to begin transitioning to Python 3 if have not already. New projects should definitely @@ -74,7 +74,7 @@ use Python 3! **NOTE REGARDING DJANGO VERSION:** The recommended release is Django 1.11. However, there initial support of -Django 2.0 as of version 0.2.7 if you'd like to try it out. +Django 2.x as of version 0.2.7 if you'd like to try it out. Please report any bugs you find! You can quickly install the latest stable version of `django-helpdesk`