Commit Graph

949 Commits

Author SHA1 Message Date
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
Jonathan Barratt
0d8e81d7f0 Merge pull request #426 from meomap/email-fallback-locale
remove hardcode default locale
2016-10-15 22:38:54 -04: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
Ross Poulton
979a13b402 Merge pull request #423 from tonioo/master
Fixed Meta class definition for TicketCustomFieldValue.
2016-10-10 10:11:32 +11:00
Antoine Nguyen
50955cb8f6 Fixed Meta class definition for TicketCustomFieldValue. 2016-10-07 11:00:25 +02:00
Garret Wassermann
3f620e83a2 Update style of Ticket FollowUp list to be a timeline 2016-09-27 17:29:59 -04:00
Garret Wassermann
929ec49fa8 Apply styling to KB pages. Minor tweak to dashboard. 2016-09-27 14:36:52 -04:00
Garret Wassermann
414f7e7c03 Make Knowledgebase categories nicer; include jQuery UI for DatePicker on new ticket form 2016-09-27 13:16:28 -04:00
Garret Wassermann
186b4ad8e2 Some of CSS changes were not included due to a conflict in the gitignore file. Updated gitignore and added missing CSS directory. 2016-09-27 10:57:21 -04: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
Garret Wassermann
6a86a0106a Updated report_index() to remove the context= so it matches the syntax of dashboard() function. 2016-09-13 00:31:56 -04:00
Garret Wassermann
bf55ab7f8c Oops, forgot to change one more URL from dashboard to report_index 2016-09-13 00:13:52 -04:00
Garret Wassermann
fe54d81022 Update unit test for backend changes to dashboard and statistics pages 2016-09-13 00:06:38 -04:00
Garret Wassermann
4203f352d9 Completely resolved jQuery issue with multiple file attachment submission on a single FollowUp due to CSS styling of file input buttons. It's really ridiculous you have to do this, but whatever. It works as expected. 2016-09-12 23:18:01 -04:00
Garret Wassermann
3002cf689c Fix CSS styling of Status radio buttons on Ticket Comment form 2016-09-12 22:54:51 -04:00
Garret Wassermann
76241b8661 Fix jQuery error with adding multiple attachments to a single FollowUp. It work when adding files one at a time but gets a little funny when adding more than one input field at a time. Also, moved RSS Feeds link to user menu to be more accessible. 2016-09-12 22:37:48 -04:00
Garret Wassermann
00cdbcf43b Finish CSS template changes for Ticket page and related properties; includes responsive Ticket list table; styled file input buttons but need to find way to update text for beyond the first input box; added a ticket_attachment_del page to confirm removal of attachment and styled it 2016-09-12 02:11:55 -04:00
Garret Wassermann
a9cb54ce7e Remove older static files, update User Settings 2016-09-11 12:30:48 -04:00
Garret Wassermann
e0875b212b Updated CSS for Ticket list and Ticket editing pages, added Font Awesome's LICENSE to list 2016-09-10 04:00:22 -04:00
Garret Wassermann
c2480d4d57 Include missing 3rd party licenses 2016-09-09 04:03:48 -04:00
Garret Wassermann
67f81ac252 Continue CSS cleanup for Ticket description, remove unneeded priority and button images and associated functions 2016-09-09 04:03:32 -04:00
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
baab36653e Merge pull request #417 from ari3s/patch-1
Syntax correction for Python 3.4 and 3.5
2016-08-22 14:24:29 +10:00
Jan Beran
8341ad217c Syntax correction for Python 3.4 and 3.5 2016-08-17 22:01:09 +02: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