Commit Graph

800 Commits

Author SHA1 Message Date
Ross Poulton
da5a4dc40f Merge pull request #411 from mrkiwi-nz/issue_408_fix
fix #408 : Bug in test_per_queue_staff_permission.py
2016-06-30 10:36:20 +10:00
Daryl
44bbcd31e5 Bug in test_per_queue_staff_permission.py
Using the django auth backend allows integers to be passed as a password
Using Peter Sagerson's ldap auth backend there is an error thrown because
some code tries to do a len() on the password.
You could argue that the ldap auth backend should str(password), but
you could also argue that passing an int as a password is bad practice

This PR ensures that a string is sent to the auth module.
2016-06-30 12:07:33 +12:00
Ross Poulton
5a51d96c73 bump version number and release to pypi 2016-06-29 08:23:05 +10:00
Ross Poulton
90e1a3c33a Merge pull request #407 from mhannig/fixed_remote_code_execution
Fixed remote code execution through unpickling untrusted code. Moved to json (de)serialize instead.
2016-06-29 08:16:36 +10:00
Matthias Hannig
5f0191957f fixed python3 compat issue 2016-06-28 18:44:54 +02:00
Matthias Hannig
895a65fdb9 Fixed remote code execution through unpickling untrusted code. 2016-06-28 18:04:39 +02:00
Ross Poulton
d65c32487c Merge pull request #406 from mrkiwi-nz/master
Fix Issue #404: Refactor converting query string into queue:id
2016-06-26 19:28:48 +10:00
Daryl
afbfd01fab Fix Issue #404: Refactor converting query string into queue:id 2016-06-26 12:45:55 +12:00
Ross Poulton
ecd870663d Merge pull request #405 from mrkiwi-nz/master
Ignore queue name when doing lookups for tickets (means URLs don't break when moving ticket between queues)
2016-06-25 21:55:40 +10:00
Daryl
e5a6686c6d Ticket #403 - This code changes the behaviour of lookups for tickets and
ignores the queue name. This means that queue changes on a ticket dont
break the email links which have already been sent out.
The queue name still exists in the link/url, but is not used in the
lookup
2016-06-24 13:46:37 +12:00
Ross Poulton
acc3b2771f Merge pull request #402 from janhh/patch-1
Make it clearer django.contrib.sites is a requirement
2016-06-23 15:43:41 +10:00
Jan Henrik Hasselberg
4e9bfb6335 django.contrib.sites is an requirement
Documentation example should point out django.contrib.sites is a requirement. I thought "sites" was optional looking at example first time.
2016-06-23 06:58:27 +02:00
Ross Poulton
d1d2b9d51e Merge pull request #401 from mrkiwi-nz/patch-1
Update README.rst to include requirement for contrib.sites
2016-06-23 14:11:00 +10:00
Daryl Egarr
14264d34a5 Update README.rst 2016-06-23 16:05:43 +12:00
Ross Poulton
e4dc3e51eb Merge pull request #399 from mrkiwi-nz/master
Changed render_to_response() to render()
2016-06-22 11:05:21 +10:00
Daryl
8a7fe5fcbf Changed the way the context is passed to render() - this was required
to enable django 1.7 to work (otherwise 1.8, 1.9 pass all tests, but 1.7 fails)
2016-06-21 20:56:43 +12:00
Daryl
558f140bfb Changed render_to_response() to render() - this should work for django1.9.4 plus django1.10
Without this change, django1.10 is missing the 'user' object from the context, which results in
a very hard to track down bug manifesting in ;
"NoReverseMatch: Reverse for 'helpdesk_rss_user' with arguments '('',)' and keyword arguments '{}' not found."
At first glance users may think this is the dots-in-usernames bug, but the username is totally missing.
2016-06-21 17:18:06 +12:00
Ross Poulton
33a61898a0 Merge pull request #398 from gleber-diniz/patch-1
Fix import error on python 3 get_email command
2016-06-15 10:23:13 +10:00
Gleber Diniz
f8044faf28 Fix import error on python 3
"from email.utils import parseaddr, collapse_rfc2231_value" works both for python 2.7 and python 3
2016-06-14 17:10:23 -03:00
Ross Poulton
0837643c17 Merge pull request #397 from mrkiwi-nz/master
Changes to templates to make them compatible with django 1.10
2016-06-10 08:58:55 +10:00
mrkiwi-nz
7dd4aa11d7 Update ticket_cc_list.html 2016-06-09 12:41:12 +12:00
mrkiwi-nz
57d341f89f Update report_output.html 2016-06-09 12:40:48 +12:00
mrkiwi-nz
783aa2481c Update email_ignore_list.html 2016-06-09 12:40:08 +12:00
mrkiwi-nz
d86b82e689 Update debug.html 2016-06-09 12:39:24 +12:00
Ross Poulton
5ba39a95bf Merge pull request #395 from smalls12/patch-1
Fix Transifex Link
2016-06-02 09:09:11 +10:00
Chathan Driehuys
9117d98aaa Fix Transifex Link
When clicking on the previous link, I got a 403 message. This new link actually takes me to the project.
2016-06-01 14:16:06 -04:00
Ross Poulton
034758bce7 Merge pull request #394 from mgalgs/patch-1
install.rst: Fix typo
2016-05-17 10:43:28 +10:00
Mitchel Humpherys
fe261a1e54 install.rst: Fix typo
setnd => send
2016-05-15 00:55:59 -07:00
Ross Poulton
303872d7c2 Merge pull request #392 from DarrenRiedlinger/login_view_ticketlist_AttributeError
Fixes #391 getattr on usersettings.setting dict always returns False.
2016-03-07 09:26:28 +11:00
Darren Riedlinger
ac8ead52c8 getattr on usersettings.setting dict always returns False. Use settings.get() instead 2016-03-06 12:46:36 -08:00
Ross Poulton
e52ae206c6 Merge pull request #388 from pawelmarkowski/master
dashboard error queues are null
2016-03-02 10:38:08 +11:00
Ross Poulton
bd7dca3a19 Merge pull request #387 from brunotikami/hotfix/make_print_statements_3x_compatible
Make print statements Python 3.x compatible
2016-03-02 09:27:01 +11:00
Pawel M
2b6c23db9f (1064, "You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ')\n GROUP BY queue, name\n ORDER BY q.id' at line 9") helpdesk/views/staff.py in dashboard 149 solved. When queues is null do not add to sql q.id in () 2016-03-01 22:53:33 +01:00
Bruno Tikami
2efe8255c5 UPDATED: print statements to be Python 3.x compatible 2016-03-01 17:01:58 -03:00
Ross Poulton
abf03d48d6 Merge pull request #382 from imbashamba/master
Nullable "default_owner" field added to Queue model
2016-02-19 09:27:00 +11:00
imbashamba
191ce3c53c Nullable "default_owner" field added to Queue model
If default_owner is specified, tickets from public form will be assigned to him and he'll be notified by email
2016-02-17 11:40:08 +03:00
Ross Poulton
b8c08b7699 Merge pull request #380 from powderflask/Fix-user_admin_url
Fix: _meta.module_name deprecated in django1.8
2016-01-29 10:23:22 +11:00
powderflask
8bf3449719 Fix: _meta.module_name deprecated in django1.8 2016-01-23 12:25:17 -08:00
Ross Poulton
4347d1ec61 Add new locales: th, ca, lv, tr_TR, he_IL, pt_PT 2015-12-22 11:35:59 +11:00
Ross Poulton
ca1690becb Deprecate custom API (see #198) 2015-12-22 11:28:00 +11:00
Ross Poulton
2df995b2a3 Release 0.1.17 - closes #362 2015-12-22 10:26:06 +11:00
Ross Poulton
0d098f6d29 Merge pull request #369 from alexbarcelo/always_create_permission
creation of Permission-per-Queue is done always
2015-12-22 09:41:17 +11:00
Ross Poulton
ed3884a919 Merge pull request #373 from flinz/master-upstream
Add HELPDESK_ENABLE_PER_QUEUE_MEMBERSHIP to discontinued settings;
2015-12-22 09:39:35 +11:00
Ross Poulton
62b635df81 Merge pull request #370 from alexbarcelo/admin-fixes
Making Queue slug unique and improving certain admin-related behaviour
2015-12-22 09:30:29 +11:00
Alex Seeholzer
a5c05cff74 added HELPDESK_ENABLE_PER_QUEUE_MEMBERSHIP to discontinued settings; 2015-12-21 13:58:28 +01:00
Alex Barcelo
7894eea1e1 Making Queue slug unique and improving certain admin-related behaviour 2015-12-18 14:56:53 +01:00
Alex Barcelo
3b547d2cf9 creation of Permission-per-Queue is done always 2015-12-18 14:35:50 +01:00
Ross Poulton
b2ae5e764f Merge pull request #367 from alexbarcelo/permission_access4
Usage of [contrib.auth.models.]Permission instead of [helpdesk.models.]QueueMembership
2015-12-18 08:51:20 +11:00
Alex Barcelo
4545fc925f fixing migration and allowing valid rollback on typical migrations 2015-12-17 18:44:10 +01:00
Alex Barcelo
0b5af429a5 reverting error due to methods and migrations 2015-12-17 18:11:54 +01:00