Commit Graph

1249 Commits

Author SHA1 Message Date
Yuego [Home]
dfdb12e354 Fix link translation 2017-03-08 23:01:31 +04:00
Garret Wassermann
18557aad38 Add Python 3.6 to Travis CI configuration 2017-02-25 04:07:20 -05:00
Garret Wassermann
9ed90b4896 Merge remote-tracking branch 'upstream/master' 2017-02-15 20:09:10 -05:00
Garret Wassermann
4eb70841e8 Merge pull request #486 from gwasser/449_contributing_docs
Update CONTRIBUTING for Testing Requirements, and update supported Python/Django combinations in docs index.rst
2017-02-15 20:06:23 -05:00
Garret Wassermann
7bd7b42788 Ignore KDE .directory files in .gitignore; totally used the wrong name (.desktop) last time, oops 2017-02-15 20:04:32 -05:00
Garret Wassermann
492e25c77b Update docs to say Python 3.4+ since that's what we current do testing against 2017-02-15 20:03:08 -05:00
Garret Wassermann
ec38150d1f Ignore KDE .desktop files in .gitignore 2017-02-15 20:00:40 -05:00
Garret Wassermann
d5e3432483 Apply word wrap to CONTRIBUTING to make it easier for viewing in text editor 2017-02-15 19:59:59 -05:00
Garret Wassermann
9dd558d71f Update gitignore to ignore KDE .directory files 2017-02-15 18:51:55 -05:00
Garret Wassermann
6fec1015c3 Work in progress on unicode chars 2017-02-15 18:51:20 -05:00
Michael Huang
b263b22cca Wrap message.encode() in conditional for Python 2 2017-02-14 14:58:16 -08:00
Michael Huang
f16a196c69 Fix logout URL 2017-02-14 14:38:48 -08:00
Michael Huang
dc851fc557 Force message to be unicode to avoid encoding issues 2017-02-14 12:34:53 -08:00
Jonathan Barratt
77978ec644 Merge pull request #485 from gwasser/481_site_id_docs
Update docs to add SITE_ID, to address #481
2017-02-12 17:36:49 +07:00
Garret Wassermann
2164c3bc4d Change queue permission_name from 50 chars to 72 chars (#484)
* Change queue permission_name from 50 chars to 72 chars to accomodate slug + prepended text, to resolve #483
2017-02-12 17:33:53 +07:00
Garret Wassermann
ea30d1845e Moved contributing.rst to CONTRIBUTING in the top-level directory, added language on required tests for new pull requests, for #449 2017-02-10 23:20:59 -05:00
Garret Wassermann
1c5f525b58 Update doc index to say Django 1.8+ required, instead of 1.7+ 2017-02-10 16:42:40 -05:00
Garret Wassermann
3740cd5ddc Update docs to add SITE_ID, to address #481 2017-02-10 16:17:16 -05:00
Jonathan Barratt
7c5daa26ea Merge pull request #477 from reduxionist/issue/474
Merge SOCKS is for all-or-no queues only for Py3 and improved handling of imap encoding errors
2017-01-17 12:54:54 +07:00
Jonathan Barratt
fe92880928
do not throw exceptions for invalid/non-UTF8 IMAP content 2017-01-14 01:25:43 +07:00
Jonathan Barratt
b5feeb7ee9
Make SOCKS-proxy support global for all queues under Py3
Python 2 retains per-queue SOCKS-proxy support, but this is simplest fix until someone needs it for Python 3.
2017-01-14 01:25:17 +07:00
Jonathan Barratt
719b03f186 Merge pull request #476 from flinz/enhancements/issue-460-remerge
Enhancements: issue 460, backlink to helpdesk usersettings via unique name
2017-01-14 01:16:05 +07:00
Alex Seeholzer
a2315eb0c4 added pep8 fix and missing migration 2017-01-13 17:39:56 +01:00
Alex Seeholzer
645f196848 Added tests covering the usersettings_helpdesk occurrences 2017-01-13 17:37:10 +01:00
Alex Seeholzer
4e018db5a6 Added unique related_name “usersetttings_helpdesk” for the one-to-one relation to User in UserSettings. 2017-01-13 15:22:41 +01:00
Alex Seeholzer
9fbe464445 Merge pull request #475 from reduxionist/issue/472/multiple-queue-models-prevent-queue-creation
Make helpdesk work in apps with their own queue models
2017-01-13 14:10:31 +01:00
Jonathan Barratt
2f66c50320
Make helpdesk work in apps with their own queue models
To avoid returning multiple content types when creating custom permissions, use ContentType.objects.get_for_model to lookup the content type for helpdesk.models.queue.
2017-01-13 17:52:29 +07:00
Jonathan Barratt
aa2265ccb1 Merge pull request #473 from tshabs/master
fix mistake in helpdesk/lib.py (subject_part declared twice, second time without stripping newline)
2017-01-13 14:24:58 +07:00
User
787c3aa4f5 make old subject_part pretty 2017-01-09 00:30:36 +01:00
User
b7baf2bf56 fix for error:BadHeaderError: Header values can't contain newlines when running get_email. caused by subject_part being repeated, but second time doesnt strip newlines 2017-01-08 18:52:24 +01:00
Jonathan Barratt
c3d83462a3 Merge pull request #471 from reduxionist/issue/470/no-tickets-datatables-error
fixes 470: datatables error on empty ticket list
2017-01-03 00:51:37 +07:00
Jonathan Barratt
8a2e6c087e
hotfix for #470: datatables error on empty ticket list
handle the no tickets match query case with js rather than python for DataTables compatibility
2017-01-03 00:42:12 +07:00
Jonathan Barratt
1c069f7f08 Merge pull request #469 from gwasser/467
Fix form end tag placement, and remove duplicate unstyled query box
2016-12-29 19:18:19 +07:00
Pawel M
8f751691a4 whitespace removed 2016-12-16 10:38:15 +01:00
Pawel M
97b3444a92 if files condition restored 2016-12-16 10:36:00 +01:00
Pawel M
fc0ae58420 lib as reduxionist + read binary mode 2016-12-16 10:30:50 +01:00
Garret Wassermann
3c6b522464 Fix form end tag placement, and remove duplicate unstyled query box 2016-12-13 23:45:43 -05:00
Pawel M
df7920cd2e missing imports added 2016-12-14 00:04:38 +01:00
Pawel M
3a372fbcb4 White space removed 2016-12-13 23:40:36 +01:00
Pawel M
f5b68772cf Downloaded attachment was not decoded and additionally encoded by default django method (its size after download is bigger than originally attached file). This is the reason why it is illegible 2016-12-13 23:31:26 +01:00
Pawel M
9939f62ebd Attachement should be readed in binary mode ... and attached as payload (regarding docs) 2016-12-13 23:28:16 +01:00
Pawel M
e7c4131ed7 Attachement should be readed in binary mode ... and attached as payload (regarding docs) 2016-12-13 22:43:14 +01:00
Pawel M
8bbe3d2e55 Merge branch 'hotfix/corrupt-forwarding-of-binary-attachments' of https://github.com/reduxionist/django-helpdesk 2016-12-13 19:53:51 +01:00
Jonathan Barratt
8dbd54ac16
stop corrupting binary attachments when delivering them by email
We accomplish this by attching files to out-bound mail diffrently
depending on the versino of Python in effect. In Py2 we can read
the files ourseles and the standard library will still
be able to use the text we pass as if it were bytes. Under Py3,
however, email.message will complain if it doesn't get to decode
the bytes itself, so instead of attaching the contents directly
 we just pass the path to the file as a string instead. Unfortunately,
Django 1.8 does not work with this Python 3 approach, due to its
 not yet having reverted to the newly improved standard library's
mail-message implementation, and thus requiring us to know more
about the character-encoding/mimetype of the attachment than I've
been able to gather cleanly by this point.
2016-12-13 19:41:13 +07:00
Pawel M
e326fea099 merged with upstream 2016-12-12 11:15:45 +01:00
Pawel M
556b6900db merged with upstream 2016-12-12 11:07:08 +01:00
Pawel M
6482c6338d merged with upstream 2016-12-12 10:32:01 +01:00
Pawel M
04ec40bbc8 merged with upstream 2016-12-12 10:31:29 +01:00
Pawel M
c11e360f50 PY3 get_email support in method ticket_from_message (if message isinstance bytes use email.email_from_bytes(msg) else ..from_string(msg)) ... clear 2016-12-12 10:30:38 +01:00
Pawel M
550ca89415 PY3 get_email support in method ticket_from_message (if message isinstance bytes use email.email_from_bytes(msg) else ..from_string(msg)) 2016-12-12 10:30:38 +01:00