Alex Barcelo
bea6fbf75a
fixing a deprecated usage, and adding a minor branch control
2016-10-30 08:38:49 +01:00
Jonathan Barratt
28308d19fb
cleanup build-breaking whitespace merge errors
2016-10-29 14:59:14 +07:00
Jonathan Barratt
26c0f2e59f
Merge pull request #441 from alexbarcelo/api-prune
...
Remove all the deprecated API related files and references
2016-10-29 14:12:31 +07:00
Alex Barcelo
53ed0d3a2c
Remove all the deprecated API related files and references
2016-10-29 08:50:13 +02:00
Jonathan Barratt
43c067dd4f
merge changes from updated master
2016-10-29 13:35:03 +07:00
Jonathan Barratt
790f1fc003
Merge pull request #374 from alexbarcelo/urls_app_name
...
Set app_name as 'helpdesk' at the urls.py, and droping url prefixes
2016-10-28 15:59:29 +07:00
Alex Barcelo
6761ad6c10
fixing RST syntax for docstring on akismet.py
2016-10-26 10:22:15 +02:00
Alex Barcelo
f017adea63
fixing those two python files
2016-10-24 10:05:41 +02:00
Alex Barcelo
89a6ae01b8
Fixing style (according to branch 'autocodestyle') + quicktest
2016-10-24 08:04:31 +02:00
Alex Barcelo
179ceb2f82
fixing style on tests
2016-10-23 22:10:32 +02:00
Alex Barcelo
30e3aa55aa
almost auto-fix on misc files
2016-10-23 22:09:17 +02:00
Alex Barcelo
3c35473265
fixing views.py (except deprecated api)
2016-10-23 22:02:02 +02:00
Alex Barcelo
24d88be8d9
Initial general clean-up of stuff
2016-10-21 17:14:12 +02:00
Garret Wassermann
d7875587b7
Revert previous change
2016-10-20 12:05:28 -04:00
Garret Wassermann
884662dd21
Ensure binary data is returns so Django can decode it
2016-10-20 11:46:09 -04:00
Garret Wassermann
dfb7987ebb
Remove emails from queue in test_get_email
2016-10-20 11:17:51 -04:00
Garret Wassermann
197fad99d2
Remove mail templates since we're not testing them here; might be good to include a test for this elsewhere
2016-10-20 02:48:14 -04:00
Garret Wassermann
5e93297787
Fix call_command options for correct format to work with Django 1.7+
2016-10-20 02:29:23 -04:00
Garret Wassermann
6418194b85
Fix command line arg for Django 1.7 and make Python 2 and 3 compatible test
2016-10-20 02:21:43 -04:00
Garret Wassermann
9606201200
Fix mock tests for get_email (hopefully for good this time)
2016-10-20 02:09:05 -04:00
Garret Wassermann
b7ef83f7d2
Check that folder is a dir before checking for mail using get_email; fix unit test for --quiet
2016-10-20 01:39:24 -04:00
Garret Wassermann
e3c9e04feb
Fix python module naming in get_email test
2016-10-20 01:25:16 -04:00
Jonathan Barratt
af893bdcc8
Merge pull request #428 from jflesch/master
...
Fix form translations
2016-10-20 12:16:31 +07:00
Daryl
3b181e87ef
Fix inconsistent indentation
2016-10-20 11:43:22 +07:00
Garret Wassermann
c9c7642724
New unit test for get_email command
2016-10-19 21:37:23 -04:00
Garret Wassermann
f61d180e5d
use django.utils.six instead of plain six
2016-10-19 20:02:12 -04:00
Alex Barcelo
91afbb9755
fixing some additional reverse stuff
2016-10-19 15:30:37 +02:00
Alex Barcelo
afd6ebad74
Merge current 'master' state into urls_app_name
2016-10-19 15:26:04 +02:00
Jerome Flesch
74668f30d5
forms.py : To get the translations for the fields' labels, use ugettext_lazy() instead for ugettext().
...
ugettext() loads the translations at the same time the module is loaded (--> always in english).
ugettext_lazy() loads them when they are needed (--> when the user makes a query --> we known the language the user wants based on the header of their HTTP request)
Signed-off-by: Jerome Flesch <jflesch@gmail.com>
2016-10-18 15:37:57 +02:00
Jerome Flesch
0ad110ec7f
forms.py: cleanup whitespaces
...
Signed-off-by: Jerome Flesch <jflesch@gmail.com>
2016-10-18 15:35:41 +02:00
meomap
96f4fecb71
add setting for fallback locale
2016-10-14 15:04:28 +07:00
Ross Poulton
138904bf8b
Update project URLs per #424
2016-10-12 11:14:10 +11:00
Ross Poulton
1f4ca64ef4
Update translations (part of #424 )
2016-10-12 10:54:24 +11:00
Antoine Nguyen
50955cb8f6
Fixed Meta class definition for TicketCustomFieldValue.
2016-10-07 11:00:25 +02:00
Garret Wassermann
f313b5c374
Added more logging statements, cleaned up a few others
2016-09-16 00:28:13 -04:00
Garret Wassermann
a4ad602f39
Remove unnecessary imports, clean up python3 handling code to use native str()
2016-09-15 22:51:00 -04:00
Garret Wassermann
e5c3c4a435
Used six to add python3 compatibility along side existing python2, and replaced print statements with logging features. Can now poll a local directory for mail too, not just remote POP3/IMAP.
2016-09-14 20:35:18 -04:00
Jan Beran
8341ad217c
Syntax correction for Python 3.4 and 3.5
2016-08-17 22:01:09 +02: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
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
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