extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2024-12-14 02:41:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
582 Commits 1 Branch 43 Tags 34 MiB
aea940cb3f
Commit Graph

582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Brentegani
aea940cb3f move decorators to their own module, rename to helpdesk_* 2014-07-28 11:46:02 +02:00
Stefano Brentegani
3e517477b7 fix lazy url in settings with Django 1.4 2014-07-28 07:32:12 +02:00
Stefano Brentegani
97c317f83d add tests, example 2014-07-28 06:47:19 +02:00
Stefano Brentegani
cba43db882 Merge branch 'master' of https://github.com/rossp/django-helpdesk into custom-staff-filter 2014-07-28 05:15:40 +02:00
Ross Poulton
fbb90cac71 Merge pull request #238 from brente/template-cleanup 
Template cleanup
 2014-07-28 08:55:31 +10:00
Stefano Brentegani
fdd2508e22 missing load url in template 2014-07-27 18:32:56 +02:00
Stefano Brentegani
8666bf57e5 Merge branch 'master' into custom-staff-filter 2014-07-26 14:10:07 +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
Ross Poulton
4d20f3bce2 Merge pull request #235 from brente/master 
Report charts not working: update jqPlot
 2014-07-26 20:30:00 +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
50cd513aec Merge branch 'master' into template-cleanup 2014-07-22 07:43:36 +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
fb6b35a724 Merge branch 'master' into custom-staff-filter 
Conflicts:
	docs/settings.rst
	helpdesk/views/staff.py
 2014-07-22 06:47:50 +02: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
Ross Poulton
7961975855 Merge pull request #228 from brente/master 
use django.utils.dates.MONTHS_3 for short month names
 2014-07-22 10:07:24 +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
Ross Poulton
21e46f010d Merge pull request #227 from brente/master 
fix setting import (fixes CI error)
 2014-07-21 13:06:57 +10:00
Ross Poulton
57f4e4dedd Merge pull request #226 from brente/docfix 
Docs: discontinued settings + formatting fix
 2014-07-21 13:06:52 +10:00
Stefano Brentegani
76b9271c10 fix setting import (fixes CI error) 2014-07-20 16:17:39 +02:00
Stefano Brentegani
11a3533dea Update settings.rst: fix formatting 2014-07-20 10:43:50 +02:00
Stefano Brentegani
13830a84e5 Custom logic for determining if the user is considered helpdesk staff. 2014-07-20 10:36:24 +02:00
Stefano Brentegani
a300dffffd Update settings.rst: sorted discontinued settings 2014-07-20 07:33:11 +02:00
Stefano Brentegani
8f7ec60fd8 Update settings.rst (discontinued settings) 
See #200
 2014-07-19 15:54:33 +02:00
Ross Poulton
3bd2d67193 Merge pull request #222 from issackelly/master 
Custom User model changes.Also closes #221. Thanks!
 2014-07-16 13:54:41 +10: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
dc7eb28ee8 Merge pull request #220 from rbas/master 
Specify  version for django-bootstrap-form
 2014-07-10 20:16:49 +10:00