Commit Graph

1039 Commits

Author SHA1 Message Date
Jonas Schnelli
a40bbdbecb
Make sure binary MIME attachments will be base64 decoded 2017-06-20 08:35:43 +02:00
Daryl Egarr
ef0ba19a3b Enhancements to Admin (#524)
* Add columns to the IgnoreEmail admin page including a calculated column of the queues the ignore relates to.

* Add columns to the IgnoreEmail admin page
including a calculated column of the queues the ignore relates to.

* Revert "Merge pull request #519 from mrkiwi-nz/master"

This reverts commit 410f59ad16, reversing
changes made to fde06d3ab1.

* Add columns to the IgnoreEmail admin page
including a calculated column of the queues the ignore relates to.

* Merge pull request #519 from mrkiwi-nz/master

Added some helpful columns and filters to the follow-up list page.

* Add more columns to the IgnoreEmail admin page
including a calculated column of the queues the ignore relates to.
2017-06-19 14:34:36 -04:00
Garret Wassermann
410f59ad16 Merge pull request #519 from mrkiwi-nz/master
Added some helpful columns and filters to the follow-up list page.
2017-06-14 01:11:37 -04:00
Daryl
5a2b0c1995 Merge branch 'master' of github.com:mrkiwi-nz/django-helpdesk 2017-06-14 16:21:31 +12:00
Daryl
55a69efcf9 Added some helpful columns to the follow-up list page. 2017-06-14 16:20:55 +12:00
Daryl
a1dd4b8330 Merge branch 'master' of github.com:mrkiwi-nz/django-helpdesk 2017-06-14 16:17:57 +12:00
Daryl
50645501b6 Forgot to run a pep8 check. 2017-06-14 16:17:26 +12:00
Daryl
e50ce8cab3 Forgot to fun a pep8 check. 2017-06-14 16:15:00 +12:00
Daryl
1c09ac505b Added some helpful columns to the follow-up list page. 2017-06-14 16:07:05 +12:00
Garret Wassermann
fde06d3ab1 Merge pull request #517 from chriscz/fix-print
Make `saved_queries.py` printing python 3 compatible
2017-06-09 21:15:31 -04:00
Chris Coetzee
399e01b04c Make saved_queries.py printing python 3 compatible 2017-06-09 22:43:48 +02:00
Garret Wassermann
75dfc7c582 Merge pull request #515 from andresf01/master
Added 'es' email templates in JSON file
2017-06-03 17:44:40 -04:00
Garret Wassermann
11b9959127 Remove the assigned_cc html tag from the fixtures, typo? 2017-06-03 17:28:12 -04:00
andresf01
559a5a4a43 Added 'es' translation to email templates 2017-06-02 11:44:49 -05:00
andresf01
5c16f3ba50 Email templates translated to es until pk:90 2017-06-01 17:34:25 -05:00
Jonathan Barratt
e197f313bd Merge pull request #507 from gwasser/bugfix
Fix a Few Bugs and Update Mail Handling
2017-04-21 06:47:51 +07:00
Garret Wassermann
fb6e8b0566 Remove offending comment in jquery ui css to address an issue brought up in #479 2017-04-20 03:06:10 -04:00
Garret Wassermann
d13e87bd3b Last PEP-8 fix? 2017-04-20 02:54:35 -04:00
Garret Wassermann
45c457ead2 More PEP-8 fixes on test_get_email 2017-04-20 02:49:06 -04:00
Garret Wassermann
47f3eb8e89 PEP-8 fixes 2017-04-20 02:44:12 -04:00
Garret Wassermann
bf344b09b1 Check CC'd email against list of User emails, and add the User to the ticket if necessary and not already the assignee, etc. 2017-04-20 02:36:10 -04:00
Garret Wassermann
8963fa694a Prevent adding Users or Queue email to the CC list 2017-04-19 23:47:58 -04:00
Garret Wassermann
220c0460e1 Check number of CCs to ensure no duplicates made it through 2017-04-19 00:04:16 -04:00
Garret Wassermann
34ce553435 Only add CC emails to Ticket if they were not already included (no duplicates), add testing for it 2017-04-18 23:36:39 -04:00
Garret Wassermann
3b22bb655a PEP8 fixes for too many blank lines 2017-04-16 05:14:30 -04:00
Garret Wassermann
e3a378625c Add test with django template tag in email body, to ensure we test for and fix #72 in future changes 2017-04-16 05:10:51 -04:00
Garret Wassermann
8e1a6b30fa Fix encoding first before splitting strings, so it works on Python 2 2017-04-16 04:59:57 -04:00
Garret Wassermann
7b8426596f Separate out the CC test from plain test so we're testing both possibilities (with and without a CC) 2017-04-16 04:51:46 -04:00
Garret Wassermann
49aac657a9 PEP8 fixups 2017-04-16 04:44:16 -04:00
Garret Wassermann
93934fea46 Add Django 1.11 to testing on Travis CI 2017-04-16 04:21:05 -04:00
Garret Wassermann
b2ac1fd3a5 #95: save CC'd emails on a comment to the Ticket for future correspondence, set to view only initially, and update tests for CC 2017-04-16 04:19:17 -04:00
Garret Wassermann
03b5e41b42 #184: provide more explicit install documentation for using MySQL with UTF-8 collation 2017-04-16 03:31:45 -04:00
Garret Wassermann
01e87f2cb8 #72: Prevent django template tags from being executed in followup comments 2017-04-16 03:24:39 -04:00
Garret Wassermann
bb59de037d Merge pull request #506 from willstott101/patch-1
Never return None from views.public.create_ticket
2017-04-13 21:59:34 -04:00
Will Stott
fb0782294e Don't show error on initial get. 2017-04-13 11:36:38 +01:00
Will Stott
b7a97183cb Never return None from views.public.create_ticket
Would create a 500 when user omitted their email. Only a partial improve. Added a TODO: as this view still breaks if passing non-numeric characters to the ID.

I assume this needs a full overhaul really.
2017-04-13 11:30:29 +01:00
Jonathan Barratt
c8935eeb63 Merge pull request #487 from mikhuang/master
`get_email` management command: Force message to unicode to avoid encoding issues
2017-04-06 08:28:39 +07:00
Jonathan Barratt
d843a21ea7 Merge branch 'master' into master 2017-04-06 08:21:43 +07:00
Jonathan Barratt
b94795bc8d Merge pull request #501 from gwasser/487_new_test
Updated get_email tests
2017-04-06 08:17:56 +07:00
Jonathan Barratt
b87a30c1c8
Update comments for consistency with their targets 2017-04-06 07:59:17 +07:00
Garret Wassermann
9531b9649a Fix errors in Python 2, used six to workaround encoding weirdness, all tests pass on both Py2/3 2017-04-03 02:52:49 -04:00
Garret Wassermann
5ec985af9b Add explicit encoding hint to top of file to allow Python 2 to read file with Unicode characters, in accordance with PEP-263 2017-04-03 02:34:54 -04:00
Garret Wassermann
0fb9094d01 Remove line for PEP8 2017-04-03 02:29:28 -04:00
Garret Wassermann
f43ef69ec1 Add a MIME multipart email test for get_email 2017-04-03 02:19:29 -04:00
Garret Wassermann
74a7afadb9 Update get_email test to use unicode characters; seem to have found an encoding errory in get_email, provided a fix that satisfies test 2017-04-03 01:53:25 -04:00
Garret Wassermann
b5fa489643 Demo requires markdown_deux for KnowledgeBase to work properly 2017-04-03 01:52:35 -04:00
Garret Wassermann
247de7ddd3 Add KnowledgeBase example data to the demo 2017-04-02 15:05:43 -04:00
Garret Wassermann
194082750d Merge remote-tracking branch 'upstream/master' into 487_new_test 2017-03-31 14:29:19 -04:00
Jonathan Barratt
19799572c9 Merge pull request #499 from Yuego/master
Migration added
2017-03-31 19:51:58 +07:00
Jonathan Barratt
6deb0caf96 Merge pull request #497 from gwasser/update_es_MX
Update es_MX translations
2017-03-31 19:37:18 +07:00