holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity
814 Commits 1 Branch 37 Tags 26 MiB
d66259efdc
Commit Graph

814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garret Wassermann
d66259efdc Update dashboard and reports to new style, add more CDN support for new javascript libraries 2016-09-09 02:45:12 -04:00
Garret Wassermann
4c89da89b5 Updated navbar, base, public_base and login page to use new StartBootstrap SB Admin v2 theme 2016-09-07 02:50:16 -04:00
Ross Poulton
574009e375 Merge pull request #416 from gwasser/update_jquery 
Update Static Copies of JS/CSS
 2016-08-08 11:30:17 +10:00
Garret Wassermann
1c09f4a3c3 Moved Buttons and Priorities images back to main static folder 2016-08-05 00:50:40 -04:00
Garret Wassermann
014af24d2d Added a HELPDESK_USE_CDN setting, off by default, to select between using public CDNs as before, and an up-to-date static copy 2016-08-05 00:38:17 -04:00
Garret Wassermann
d9480c9cf0 Update static jQuery and other js/css, disable CDN usage 2016-08-04 23:57:35 -04:00
Ross Poulton
f2e497c3c6 Merge pull request #415 from mhannig/fix-broken-keyword-search 
JSON Serialization broke Keyword-Searches
 2016-07-05 08:48:10 +10:00
Matthias Hannig
a37f7145ec Serializing the query using JSON for SavedSearches unfortunately broke 
Keyword-Searches.

Now, only the search string is serialized for saving and
the "qset" is moved from "other_filters" to apply_query.
 2016-07-04 17:47:53 +02:00
Ross Poulton
03b3a70975 Merge pull request #410 from mrkiwi-nz/fix_savequery 
Fix savequery
 2016-06-30 10:36:41 +10:00
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
Daryl
bfaddcdbb5 Merge branch 'fix_savequery' of github.com:mrkiwi-nz/django-helpdesk into fix_savequery 2016-06-30 11:38:32 +12:00
Daryl
0ac7183875 Add test for saving a query, fix shared checkbox issue 
My browser sends 'on' when a checkbox is ticked, django ORM only
recognises '1', 'true' or 't' as valid 'True' responses.
This throws an error
ValidationError at /helpdesk/save_query/
[u"'on' value must be either True or False."]

This could be fixed with " value='1'" in the template, but testing that is harder
My fix is to add a check in the view. 2 more lines, but easier to unittest.
Core devs need to make a call as to which solution is best.

D
 2016-06-30 11:36:21 +12:00
Daryl
3ffe505f29 Wrong method to test the url 
Forgot that Travis urls have the 'http://testserver' part at the front
 2016-06-30 11:29:35 +12:00
Daryl
a842d1a9c3 Error in class name 
Copied a test, forgot to change the test class name
 2016-06-30 10:50:04 +12:00
Daryl
fb3b024592 Add test for saving a query, fix shared checkbox issue 
My browser sends 'on' when a checkbox is ticked, django ORM only
recognises '1', 'true' or 't' as valid 'True' responses.
This throws an error
ValidationError at /helpdesk/save_query/
[u"'on' value must be either True or False."]

This could be fixed with " value='1'" in the template, but testing that is harder
My fix is to add a check in the view. 2 more lines, but easier to unittest.
Core devs need to make a call as to which solution is best.

D
 2016-06-30 10:49:49 +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