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

479 Commits

Author SHA1 Message Date
Emmanuel Cohen
b0db7aa666 Fix exeception for templetags (works on django 1.7/py3.4 & django 1.6/py2.7) 2015-04-28 14:50:49 +02:00
Ross Poulton
70c57f9096 Merge 2015-04-28 09:13:54 +10:00
Tony Zhu
ed9581e5de Remove deprecated load url from future 2015-04-16 11:58:24 -04:00
Tony Zhu
807e0c5ea9 Remove extra space line 2015-04-14 16:29:47 -04:00
Tony Zhu
9600f457d8 Remove no effect model property to silence django 1.8 system check warning 2015-04-14 16:25:20 -04:00
Tony Zhu
11e4f1a7bd Merge upstream changes 2015-04-14 16:10:13 -04:00
Ross Poulton
bb2c240ef8 Use proper URL names for hold/unhold rather than manually building URL. Fixes #299 2015-02-14 11:13:19 +11:00
Ross Poulton
19ec7bee96 Extend attachment filefield max length in upload form. Fixes #301. 2015-02-14 11:02:58 +11:00
Alex Seeholzer
4ba29c500c Merge branch 'bugfix_models' 
* bugfix_models:
  bug fix for commit
 2015-02-11 13:25:52 +01:00
Alex Seeholzer
ddabc9d133 bug fix for commit 2015-02-11 13:23:42 +01:00
Alex Seeholzer
4c89456bc1 Merge branch 'populate_usersettings' 
* populate_usersettings:
  Added south migration to populate the initially existing users with usersettings.
 2015-02-11 13:14:55 +01:00
Alex Seeholzer
a11227c6c1 Added south migration to populate the initially existing users with usersettings. 2015-02-11 13:14:36 +01:00
Alex Seeholzer
9665361bb1 In Django < 1.7, if settings.AUTH_USER_MODEL is defined, the sender is expected to be the actual instance, not a string. This Closes rossp/django-helpdesk#295 by checking for django version < 1.7. 2015-02-11 12:23:59 +01:00
Alex Seeholzer
a87e1355ee Added missing south migration, adding the missing fields 'helpdesk_queue.socks_proxytype'. This fixes rossp/django-helpdesk#291. 2015-02-10 17:30:32 +01:00
Simon Thépot
83affccec5 Specify features to load in failing testcase for django < 1.7 2015-01-14 16:00:35 +01:00
Simon Thépot
b53d3ad9bc Rename initial_data.json to emailtemplate.json 2015-01-14 15:49:08 +01:00
Simon Thépot
f68c1b3ae9 Django1.7 tests: load initial_data w/ migration 2015-01-14 15:36:37 +01:00
Simon Thépot
f0156cfcb3 Populate user settings w/ data migration, Django1.7 compatible, fix #276 2015-01-14 11:19:17 +01:00
TreeNode
ae681dd5d3 Clear host and port if no proxy type was set 2014-12-11 12:03:36 +02:00
TreeNode
54dd376b9c Check for sock lib has installed 2014-12-11 01:44:47 +02:00
TreeNode
135e2d65ea Created new migrations 2014-12-11 01:42:55 +02:00
TreeNode
83a5e964f3 Default field values 2014-12-11 01:42:20 +02:00
TreeNode
50b80b2a08 Socks proxy support 2014-12-10 23:37:34 +02:00
Jenny Qian
859935e5ee exclude '\r' from subject_part 
This is to prevent BadHeaderError("Header values can't contain newlines..
 2014-10-29 10:57:31 -05:00
Ross Poulton
0d9446480e Merge pull request #273 from vladyslav2/master 
Fix replace function for custom fields
 2014-10-27 11:17:53 +11:00
Vladyslav T
f1147f695a Fix replace function for custom fields 2014-10-25 22:53:56 +03:00
Tom Graham
33728bc0b1 Revert "Make sure custom user logic works with Django 1.4" 
This reverts commit 1aed6c9a96.
 2014-10-24 18:05:44 +11:00
Tom Graham
1aed6c9a96 Make sure custom user logic works with Django 1.4 
Monkey Patch for Django 1.4 to allow new custom user model logic.
 2014-10-24 17:56:52 +11:00
Tony Zhu
8635742931 Rename the initial data to avoid django 1.7 flush bug 2014-10-23 10:48:11 -04:00
Tony Zhu
dc86236136 Go back to the original helpdesk repo 2014-10-23 10:44:59 -04:00
Tom Graham
eef2a66f23 Fix for no model_name in django < 1.6 2014-10-22 17:35:24 +11:00
Tom Graham
15feb7def3 Typo in previous commit 2014-10-22 17:32:17 +11:00
Tom Graham
d966172fb7 Fix user changelist for custom user models 
Fixed the user_admin_changelist url for custom user models.
 2014-10-22 17:23:56 +11:00
Tom Graham
d2ac8af6c0 Improved support for custom user models 
Support for custom user models with a non-standard username field
 2014-10-22 16:18:04 +11:00
Tony Zhu
af1a297460 Merge from origin repo 2014-10-20 14:12:40 -04:00
Ross Poulton
b0756497dc Merge pull request #262 from AGASS007/master 
fixed tooltip (again)
 2014-09-24 08:17:20 +10:00
Guillaume Andreu Sabater
d5dd2c3423 actually enable tooltip 2014-09-22 14:04:14 +02:00
Guillaume Andreu Sabater
45eda26e7c swapped <a> and <strong> tags 2014-09-22 14:03:37 +02:00
Guillaume Andreu Sabater
05350ba37c fixed typo 2014-09-22 14:00:33 +02:00
Antoine Nguyen
58c2c818f4 Use the right values to identify priorities. 2014-09-22 10:01:08 +02:00
Antoine Nguyen
8095d30e8e Remove unknown reference to priority. 2014-09-19 16:06:11 +02:00
Antoine Nguyen
ad47087c8f Assign a bootstrap row color to tickets based on priority. 2014-09-19 16:01:15 +02:00
Antoine Nguyen
91628ab788 Do not use the builtin staff_member_required decorator. 
Before 1.7, this decorator always redirects to the admin login page so the LOGIN_URL
setting is useless.
 2014-09-19 15:15:42 +02:00
Guillaume Andreu Sabater
85b90d0030 Enable bs3 tooltips with html markup 2014-09-18 14:42:06 +02:00
Ross Poulton
863effdcb6 Update French translations. Thanks to @tonioo; closes #259. 2014-09-18 09:50:18 +10:00
Ross Poulton
7fe1cb4c9f Update & recompile translations 2014-09-16 19:54:05 +10:00
Ross Poulton
1a157ed097 Django 1.7 compat update. Fixes #255, thanks @danie1k 2014-09-11 17:37:51 +10:00
Ross Poulton
61f49786c0 Fixes for Django 1.7. For prior Django versions, South 1.0 must be used for 
migirations. Fixes #254.
 2014-09-10 09:06:50 +10:00
Ross Poulton
4c901880bc Allow file attachments in storages other than local files (eg S3). Fixes GH-249. 2014-09-02 18:36:00 +10:00
Ross Poulton
1aed98463a Increase size of attachment filename. Fixes #164. 2014-09-02 18:36:00 +10:00
Stefano Brentegani
5346c17629 Merge branch 'master' of https://github.com/rossp/django-helpdesk into refactor-staff-filter 2014-07-31 06:22:59 +02:00
Stefano Brentegani
299c23671a update .po files (preserve already translated text) 2014-07-30 11:13:42 +02:00
Stefano Brentegani
94fa283f2d mark new translatable strings and reduce redundancy 2014-07-30 10:41:10 +02:00
Stefano Brentegani
5e1616d83a split blocktrans in templates 2014-07-30 10:40:13 +02:00
Stefano Brentegani
9bbcaa5cc0 download and recompile translations from Transifex (adds Arabic) 2014-07-30 09:53:24 +02:00
Stefano Brentegani
fdd2508e22 missing load url in template 2014-07-27 18:32:56 +02:00
Stefano Brentegani
0c93de8bdb Merge branch 'master' into template-cleanup 
Conflicts:
	helpdesk/templates/helpdesk/navigation.html
 2014-07-26 14:03:08 +02:00
Ross Poulton
d38240e3cb Merge pull request #237 from brente/user-menu 
User menu
 2014-07-26 20:30:44 +10:00
Ross Poulton
201a7e91cd Merge pull request #236 from brente/fix-typo 
fix typo in template condition
 2014-07-26 20:30:17 +10:00
Stefano Brentegani
5e9fd86941 Bootstrap version of the user settings form 2014-07-25 20:57:34 +02:00
Stefano Brentegani
9433f34f9b Nav: use full user name, if available, fix icon 2014-07-25 20:14:13 +02:00
Stefano Brentegani
b05c396918 User menu = User settings, Change password, Logout 2014-07-25 18:08:47 +02:00
Stefano Brentegani
47bec43108 fix typo in template condition 2014-07-25 17:23:54 +02:00
Stefano Brentegani
597fd2b4af update jqPlot (resolves compatibility issues with jQuery 1.9+) 2014-07-25 14:47:37 +02:00
Stefano Brentegani
311dfa6dbd missing spaces in navigation menu 2014-07-25 14:08:35 +02:00
Ross Poulton
b1b1f93e1e speed up dashboard queries by using select_related (fixes #233) 2014-07-23 09:37:21 +10:00
Stefano Brentegani
6d86b62673 missing template lib references 2014-07-22 19:27:37 +02:00
Stefano Brentegani
78103c345b separate dashboard elements for easier customisation 2014-07-22 19:20:40 +02:00
Stefano Brentegani
cfd0ca3b7d remove row_columnheads class from table headers 2014-07-22 16:09:06 +02:00
Stefano Brentegani
df32432685 Merge commit 'fd0ab29dfcfc263be686c8351f4dc5880e3e1b9b' into template-cleanup 
Conflicts:
	helpdesk/templates/helpdesk/dashboard.html
	helpdesk/templates/helpdesk/kb_category.html
	helpdesk/templates/helpdesk/ticket_desc_table.html
 2014-07-22 07:28:04 +02:00
Ross Poulton
1524cb4ca1 Merge pull request #232 from brente/ago-naturaltime 
Use naturaltime for elapsed times
 2014-07-22 14:59:20 +10:00
Stefano Brentegani
d95aa46b03 Merge branch 'master' into template-cleanup 2014-07-22 06:43:05 +02:00
Ross Poulton
a2a214d33d Merge pull request #231 from brente/no-admin-url 
Remove undocumented ADMIN_URL setting
 2014-07-22 10:09:45 +10:00
Ross Poulton
ef84c90732 Merge pull request #230 from brente/navigation-nokb 
exclude KB from navigation if HELPDESK_KB_ENABLED is False
 2014-07-22 10:09:15 +10:00
Stefano Brentegani
04112a109d fix unquoted urls in template 2014-07-21 21:43:29 +02:00
Stefano Brentegani
c711a54d8d Merge commit '21e46f010dfecea1562a4d2b308fd78b71fec8a0' into no-admin-url 
Conflicts:
	helpdesk/urls.py
 2014-07-21 21:38:40 +02:00
Stefano Brentegani
9c97172624 missed for ... empty opportunity 2014-07-21 21:30:32 +02:00
Stefano Brentegani
0f103ea827 use for ... empty in templates 2014-07-21 20:28:37 +02:00
Stefano Brentegani
b530f19d65 templates: removed row_odd, row_even, row_hover classes and hover.js 2014-07-21 20:19:23 +02:00
Stefano Brentegani
6abc0ba9a9 replace row_tablehead with caption 2014-07-21 20:02:50 +02:00
Stefano Brentegani
fe5c7135a6 exclude KB from navigation if HELPDESK_KB_ENABLED is False (fixes #223) 2014-07-21 18:44:54 +02:00
Stefano Brentegani
fd0ab29dfc use naturaltime for elapsed times (resolves #229) 2014-07-21 10:21:33 +02:00
Stefano Brentegani
c477f575db use django.utils.dates.MONTHS_3 for short month names (resolves #225) 2014-07-21 09:12:27 +02:00
Stefano Brentegani
76b9271c10 fix setting import (fixes CI error) 2014-07-20 16:17:39 +02:00
Issac Kelly
073df0b03e Continuation 2014-07-15 16:04:19 -07:00
Issac Kelly
19c1913268 Allow Templated Subjects. 2014-07-15 15:48:42 -07:00
Issac Kelly
978c0665b8 Custom User model changes. 2014-07-15 14:02:31 -07:00
Ross Poulton
fe1bfd1fa4 Replace django.contrib.markup with django-markdown-deux. Closes #219. 2014-07-07 12:10:53 +10:00
Gabriel Pichot
27217edf4a Changed references from auth.User to get_user_model (views, forms & commands) 2014-06-18 16:21:37 +02:00
Aaron C. de Bruyn
ae53c1f6c7 Strip out carriage returns from subjects. Coses GH-209 2014-06-17 12:01:33 -07:00
Ross Poulton
ea9b772f35 Merge pull request #214 from Inboxen/testing-fixes 
Testing fixes
 2014-06-06 10:17:18 +10:00
Matt Molyneaux
4caa54f84d Move CustomField to field class code to a mixin 2014-06-05 09:51:19 +01:00
Matt Molyneaux
28c3690da7 Give CustomField.empty_selection_list a default value 
BooleanField defaults to False <1.6 and to None >=1.6, causing tests to fail on 1.6
 2014-06-05 01:30:27 +01:00
s3h10r
fece448308 fixes: attachments in public comments not shown in public_view_ticket 
if no followup.ticketchange_set.all is present the attachments
of followups were not shown to a public user.
 2014-05-26 17:28:36 +02:00
Tony Zhu
fced647271 Use json instead of deprecated django.utils.simplejson 2014-03-31 14:43:59 -04:00
Adam Fast
830a62e986 Update with default for HAS_TAG_SUPPORT 
Migration 0006 imports this setting but no value is available so an ImportError is thrown.
 2014-03-04 14:20:47 -06:00
Ross Poulton
d99df4a43e Merge pull request #206 from gjedeer/patch-1 
Protocol-independent CDN links
 2014-02-20 08:57:20 +11:00
GDR!
07a3b91b6f Protocol-independent CDN links 2014-02-19 16:17:13 +01:00
GDR!
53640e0b3e Protocol-independent CDN links 2014-02-19 16:16:17 +01:00
Ross Poulton
36c7e59f07 Merge pull request #169 from mpietsch/ticket_caption_sorting 
Caption and sorting of tickets in dropdown menus should use ID, e. g. when adding a dependency
 2014-01-30 17:52:03 -08:00
Ross Poulton
452a34ad72 Smart email parsing (closes #203): Use email-reply-parser to ignore cruft in incoming emails 2014-01-29 23:08:33 +11:00
Ross Poulton
0e58c99f69 Remove unncessary translate code in base.html; comment translation still functions. 2014-01-29 22:55:06 +11:00
Ross Poulton
fd9881e6e0 Fix display of saved queries for authenticated users when CONTEXT_PROCESORS didn't include request. 2014-01-29 22:48:54 +11:00
Ross Poulton
2b225d6843 settings.py cleanup (#200); remove HELPDESK_KB_ENABLED_STAFF and HELPDESK_NAVIGATION_STATS_ENABLED (now always on); removed HELPDESK_NAVIGATION_CUSTOM_EXTEND - just use custom template! 2014-01-29 22:37:36 +11:00
Ross Poulton
a9c7e3ab72 settings.py cleanup (#200): remove org name / logo. These belong in local templates, not settings. 2014-01-29 22:30:26 +11:00
Ross Poulton
77f0512c76 settings.py cleanup (#200): remove HELPDESK_SUPPORT_PERSON; please add into attribution.html if needed. 2014-01-29 22:27:42 +11:00
Ross Poulton
1066049ccc settings.py cleanup (#200); Remove HELPDESK_SHOW_KB_ON_HOMEPAGE (new default is YES) 2014-01-29 22:26:35 +11:00
Ross Poulton
cd1172b35a settings.py cleanup (#200): Remove HELPDESK_SHOW_DELETE_BUTTON_TICKET_TOP and HELPDESK_SHOW_EDIT_BUTTON_TICKET_TOP; both links now always show. 2014-01-29 22:23:42 +11:00
Ross Poulton
a5b9ae1f0a settings.py cleanup (#200): Change HELPDESK_UPDATE_PUBLIC_DEFAULT to False. This re-shows the 'is public?' tickbox. 2014-01-29 22:19:35 +11:00
Ross Poulton
b85b45a14a settings.py cleanup (#200) - Remove HELPDESK_CUSTOM_WELCOME; always show this reworded message. 2014-01-29 22:17:45 +11:00
Ross Poulton
8427c622aa Remove extraneous HAS_TAG_SUPPORT setting 2014-01-29 22:16:05 +11:00
Ross Poulton
4930579534 settings.py cleanup: remove options for footer links; API link always shows and removed language selector. 2014-01-29 22:15:37 +11:00
Ross Poulton
66da47205e settings.py cleanup (#200) - remove HELPDESK_DASHBOARD_BASIC_TICKET_STATS, always shows now. This resolves #201 to my satisfaction for now. 2014-01-29 22:13:42 +11:00
Ross Poulton
99e9bd33d8 Settings.py cleanup (#200): Remove HELPDESK_DASHBOARD_HIDE_EMPTY_QUEUES 2014-01-29 22:09:58 +11:00
Ross Poulton
07a9093dae settings.py cleanup (#200): Always show Delete button on dashboard 2014-01-29 22:08:21 +11:00
Ross Poulton
d340446feb Remove django-tagging support, as that library is unmaintained. Closes #194. 2014-01-29 22:00:00 +11:00
Ross Poulton
2718315d53 Merge pull request #191 from leonh/master 
added a bootstrap3 based layout, thanks @leonh. Updates #180 too. Needs more testing and tweaking (eg 'Edit' forms, add django-bootstrap-form to requirements & readme).
 2014-01-22 02:24:59 -08:00
Bryce Groff
020d1cefae - Use the Django 1.5 get_user_model function if it exists in Django, i.e. 1.5 and above. 2014-01-15 13:39:38 -10:00
Leon Harris
e7e2781d65 added local nav extension via a specified template 2013-12-09 16:48:11 +00:00
Leon Harris
f6a8c80755 added bit of colour on the ticket detail page 2013-11-26 12:09:55 +00:00
Leon Harris
a419956f4c fixed responsive problems with navigation moved logo into body of page altered headings 2013-11-26 10:59:45 +00:00
Leon Harris
7fcb829e54 updated templated to use CDN bootstrap3, CDN jquery, added logo to navigation, minor layout changes requires http://github.com/tzangms/django-bootstrap-form 2013-11-25 15:51:14 +00:00
Ross Poulton
cf63c61d82 Merge pull request #190 from tony-zhu/master 
Fix the bug of handling attachments when Django DEFAULT_FILE_STORAGE is not default. Should fix #3.
 2013-11-19 14:00:29 -08:00
Tony Zhu
b6339cc016 Fix the bug of handling attachments when Django DEFAULT_FILE_STORAGE is not FileSystemStorage 2013-11-19 21:24:52 +00:00
Ross Poulton
95a1bfb6b7 Merge pull request #189 from tony-zhu/master 
RSS feed not working for user name with @ in it. Fixes issue
 2013-11-14 14:15:16 -08:00
Tony Zhu
51114c8029 RSS feed not working for user name with @ in it. Fixes issue 2013-11-14 20:34:39 +00:00
Stefano Brentegani
eb3becb9a9 fixes = vs == in template 2013-11-07 13:22:04 +01:00
Tony Zhu
7624e77524 Fix the navigation links for NON_STAFF to create new ticket if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE is enabled 2013-10-14 14:55:44 -04:00
Ross Poulton
f65247278f Update and recompile all translations. Closes #185. 2013-10-01 11:31:38 +10:00
Ross Poulton
98340b524d Fixes #181. Thanks @AntonOfTheWoods 2013-09-16 11:54:46 +10:00
Ross Poulton
f63b670893 Merge pull request #170 from mpietsch/status_dependencies 
Ticket status now shows that there are open dependencies.
 2013-05-28 17:03:35 -07:00
Ross Poulton
3e80ded22f Merge pull request #174 from mpietsch/cctemplate2 
Now using mail template ..._cc for informing cc addresses.
 2013-04-22 17:33:48 -07:00
root
d177291409 Now using mail template ..._cc for informing cc addresses. 2013-04-19 08:54:24 +02:00
xmacaba
78cc734a12 Update public_view_ticket.html 
It returns the id of the post, but this value is not eligible for ticket viewing. Instead, you must provide the [queue]-[ticket_id].
 2013-04-01 20:06:37 -03:00
Darrell Enns
a4b3185525 fix urls.py for django 1.3 compatibility 2013-03-18 11:58:07 -07:00
Darrell Enns
8f0a80d322 added url tag compatibility fix for django <1.5 
added django 1.5 to travis
 2013-03-18 11:41:43 -07:00
Darrell Enns
ca1c6a270c compatibility fixes for django 1.5 2013-03-18 10:57:39 -07:00
root
9b593472f7 Ticket status now shows that there are open dependencies. 2013-03-06 11:19:13 +01:00
root
20d5a24eab Caption and sorting of tickets in dropdown menus should use ID, e. g. when adding a dependency. 2013-03-06 10:58:25 +01:00
root
306d8bf4d3 Changed regex for email subjects to use queue slug to tell internal ticket id from external ones. 2013-02-27 16:14:16 +01:00
Ross Poulton
127d57e386 Fix timezone import for Django < 1.4 2013-01-23 12:21:54 +11:00
Ross Poulton
556cf5d302 fix tpyo - importError vs ImportError 2013-01-23 11:55:36 +11:00
Ross Poulton
53273e3794 Fix datetime/timezone handling in Django <1.4; update management commands to be timezone-aware 2013-01-23 11:35:18 +11:00
Ross Poulton
341a40b9ae Make datetime handline offset-aware. Now requires pytz. Fixes #142. 2013-01-23 10:59:12 +11:00
Ross Poulton
13702852e1 Merge branch 'master' of github.com:rossp/django-helpdesk 2013-01-21 17:25:39 +11:00
Ross Poulton
6c440f3ed0 Fix #160 - send e-mails to ticket CC list even if there is no ticket submitter 2013-01-21 17:25:14 +11:00
Ross Poulton
4736ef3c98 Merge pull request #156 from URpages/master 
Make sure that blank strings do not kill in_list. Also fixes #107.
 2013-01-19 19:54:27 -08:00
Ross Poulton
22b68430df Fix from @kotowicz to fix filename encoding. Closes #162 and #149 2013-01-20 14:45:33 +11:00
Ross Poulton
6b0c9c48e8 Closes #161 - provide script to simplify automation of email polling 2013-01-20 14:40:57 +11:00
Ross Poulton
e3ef1e4f20 Closes #163 - ignore automatic email replies 2013-01-20 14:39:07 +11:00