Merge 0.2.22 bugfix release updates, update copyright year in license, specify python 3.6 or above in setup

This commit is contained in:
Garret Wassermann
2020-07-30 04:46:15 -04:00
17 changed files with 2390 additions and 1642 deletions

View File

@@ -121,6 +121,10 @@ if HELPDESK_EMAIL_SUBJECT_TEMPLATE.find("ticket.ticket") < 0:
# default fallback locale when queue locale not found
HELPDESK_EMAIL_FALLBACK_LOCALE = getattr(settings, 'HELPDESK_EMAIL_FALLBACK_LOCALE', 'en')
# default maximum email attachment size, in bytes
# only attachments smaller than this size will be sent via email
HELPDESK_MAX_EMAIL_ATTACHMENT_SIZE = getattr(settings, 'HELPDESK_MAX_EMAIL_ATTACHMENT_SIZE', 512000)
########################################
# options for staff.create_ticket view #