Commit Graph

972 Commits

Author SHA1 Message Date
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
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
Garret Wassermann
3c6b522464 Fix form end tag placement, and remove duplicate unstyled query box 2016-12-13 23:45:43 -05:00
Jonathan Barratt
6908e956e0 Merge pull request #465 from reduxionist/bugfix/urlquote-email-in-redirect
urlquote email address when used as get query param
2016-12-11 23:27:52 +07:00
Jonathan Barratt
e82e5fcd5f
urlquote email address when used as get query param 2016-12-11 06:20:03 +07:00
Jonathan Barratt
0edc75fc6c Merge pull request #464 from reduxionist/pr/393
solves Title changed to . (Null title) on failed attachment upload.
2016-12-11 06:18:24 +07:00
Pawel M
94c39cba69
solves Title changed to . (Null title) on failed attachment upload. 2016-12-11 06:00:05 +07:00
Jonathan Barratt
15c67da2a1 Merge pull request #463 from reduxionist/issue/multi/attachments
refactor all handling of attached files
2016-12-11 05:56:37 +07:00
Jonathan Barratt
5acd891c68
refactor all handling of attached files
Extract attachment processing from forms, views.staff, and management.command.get_email modules, and consolidate it into a unified lib module function.
Also refactor the affected components, most notably lib.send_templated_email, to make it easier (IMO) to reason about changes to them.
Add unit tests for attachments with UTF-8 filenames, and functional tests for submission of same, as well as ASCII versions, through the public ticket-form.
Remove unused Attachment method "get_upload_to".
2016-12-08 19:47:20 +07:00
Alex Seeholzer
142c2367d2 Merge pull request #459 from reduxionist/flinz_tests/get-email
Expands testing of get_email
2016-12-08 09:39:20 +01:00
Jonathan Barratt
391e35065c
per code review, update safe IP addr/port constants, remove commented-out code, and add comments to unexplained code 2016-12-06 09:55:22 +07:00
Jonathan Barratt
e8d0c5b2c7
implement mocked pop3 and imap tests for get_email
also update travis to latest django patch releases
2016-12-02 19:04:52 +07:00
Alex Seeholzer
4a7286f371
added requirements for testing 2016-12-02 17:40:46 +07:00
Alex Seeholzer
399b0901f6
newer version of tests 2016-12-02 17:40:46 +07:00
Alex Seeholzer
72a99cc99a
Moved existing test for local mailbox into generation of tests for matrix of email configurations; 2016-12-02 17:40:46 +07:00
Jonathan Barratt
1f63691dbe Merge pull request #457 from reduxionist/hotfix/456/ticket_from_message-missing-arg
hotfix for #456:  patch calls to ticket_from_message
2016-11-29 00:56:22 +07:00
Jonathan Barratt
3cfa371199
hotfix for #456: patch calls to ticket_from_message
add logger arg where missing in get_email
2016-11-29 00:46:42 +07:00
Jonathan Barratt
cac3267e82 Merge pull request #454 from reduxionist/prune-legacy-code
Prune legacy code
2016-11-21 20:32:35 +07:00
Jonathan Barratt
45a8ce98ac Merge pull request #455 from gwasser/ticket_list_view
Use HTML5 table ordering based on Unix epoch
2016-11-21 20:29:13 +07:00
Garret Wassermann
04f27fdcff Use HTML5 table ordering based on Unix epoch 2016-11-21 00:12:24 -05:00
Jonathan Barratt
7738bba2ab
remove special-case imports for legacy versions
standardise use, or avoidance, of timezone, template from_string, and Context
2016-11-21 10:16:03 +07:00
Jonathan Barratt
b4aa7767bd
drop quicktest compatibility for unsupported django versions 2016-11-21 09:31:40 +07:00
Jonathan Barratt
73fd081b48 Merge pull request #453 from willstott101/stringio_six
Use Django's six module for StringIO imports.
2016-11-17 19:11:37 +07:00
Will Stott
f34696df8d Use Django's six module for StringIO imports. 2016-11-17 11:25:46 +00:00
Jonathan Barratt
07f7489e2c Merge pull request #452 from gwasser/get_email
Ensure that local files are deleted after processing
2016-11-12 12:02:48 +07:00