50cd513aec
Merge branch 'master' into template-cleanup
2014-07-22 07:43:36 +02:00
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
1524cb4ca1
Merge pull request #232 from brente/ago-naturaltime
...
Use naturaltime for elapsed times
2014-07-22 14:59:20 +10:00
fb6b35a724
Merge branch 'master' into custom-staff-filter
...
Conflicts:
docs/settings.rst
helpdesk/views/staff.py
2014-07-22 06:47:50 +02:00
d95aa46b03
Merge branch 'master' into template-cleanup
2014-07-22 06:43:05 +02:00
a2a214d33d
Merge pull request #231 from brente/no-admin-url
...
Remove undocumented ADMIN_URL setting
2014-07-22 10:09:45 +10:00
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
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
04112a109d
fix unquoted urls in template
2014-07-21 21:43:29 +02:00
c711a54d8d
Merge commit '21e46f010dfecea1562a4d2b308fd78b71fec8a0' into no-admin-url
...
Conflicts:
helpdesk/urls.py
2014-07-21 21:38:40 +02:00
9c97172624
missed for ... empty opportunity
2014-07-21 21:30:32 +02:00
0f103ea827
use for ... empty in templates
2014-07-21 20:28:37 +02:00
b530f19d65
templates: removed row_odd, row_even, row_hover classes and hover.js
2014-07-21 20:19:23 +02:00
6abc0ba9a9
replace row_tablehead with caption
2014-07-21 20:02:50 +02:00
fe5c7135a6
exclude KB from navigation if HELPDESK_KB_ENABLED is False ( fixes #223 )
2014-07-21 18:44:54 +02:00
fd0ab29dfc
use naturaltime for elapsed times ( resolves #229 )
2014-07-21 10:21:33 +02:00
c477f575db
use django.utils.dates.MONTHS_3 for short month names ( resolves #225 )
2014-07-21 09:12:27 +02:00
21e46f010d
Merge pull request #227 from brente/master
...
fix setting import (fixes CI error)
2014-07-21 13:06:57 +10:00
57f4e4dedd
Merge pull request #226 from brente/docfix
...
Docs: discontinued settings + formatting fix
2014-07-21 13:06:52 +10:00
76b9271c10
fix setting import (fixes CI error)
2014-07-20 16:17:39 +02:00
11a3533dea
Update settings.rst: fix formatting
2014-07-20 10:43:50 +02:00
13830a84e5
Custom logic for determining if the user is considered helpdesk staff.
2014-07-20 10:36:24 +02:00
a300dffffd
Update settings.rst: sorted discontinued settings
2014-07-20 07:33:11 +02:00
8f7ec60fd8
Update settings.rst (discontinued settings)
...
See #200
2014-07-19 15:54:33 +02:00
3bd2d67193
Merge pull request #222 from issackelly/master
...
Custom User model changes.Also closes #221 . Thanks!
2014-07-16 13:54:41 +10:00
073df0b03e
Continuation
2014-07-15 16:04:19 -07:00
19c1913268
Allow Templated Subjects.
2014-07-15 15:48:42 -07:00
978c0665b8
Custom User model changes.
2014-07-15 14:02:31 -07:00
dc7eb28ee8
Merge pull request #220 from rbas/master
...
Specify version for django-bootstrap-form
2014-07-10 20:16:49 +10:00
1a743b883f
Specify version for django-bootstrap-form
2014-07-09 12:39:15 +02:00
fe1bfd1fa4
Replace django.contrib.markup with django-markdown-deux. Closes #219 .
2014-07-07 12:10:53 +10:00
d7c9b9debb
Merge pull request #218 from gpichot/master
...
Changed references from auth.User to get_user_model (views, forms & commands)
2014-06-19 09:35:07 +10:00
27217edf4a
Changed references from auth.User to get_user_model (views, forms & commands)
2014-06-18 16:21:37 +02:00
333429f21f
Merge pull request #217 from darkpixel/GH-209-BadHeaderError
...
Strip out carriage returns from subjects. Coses GH-209
2014-06-18 08:59:11 +10:00
ae53c1f6c7
Strip out carriage returns from subjects. Coses GH-209
2014-06-17 12:01:33 -07:00
ea9b772f35
Merge pull request #214 from Inboxen/testing-fixes
...
Testing fixes
2014-06-06 10:17:18 +10:00
c4fdbb554c
Merge pull request #215 from Inboxen/form-mixin
...
Move CustomField to field class code to a mixin
2014-06-06 10:15:19 +10:00
4caa54f84d
Move CustomField to field class code to a mixin
2014-06-05 09:51:19 +01:00
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
8b2489d87d
Grab requirements.txt for tests and remove Django 1.3 testing (requirements.txt asks for Django>1.4)
2014-06-05 01:07:05 +01:00
b41eae040d
Remove --use-mirrors
2014-06-05 01:07:05 +01:00
a99f444e96
Fix missing bits of test
...
Travis will now grab the newest point releases of Django, including 1.6.5
Also added 'bootstrapform' to test settings to reduce failing tests to actual bugs
2014-06-05 01:07:05 +01:00
2a257c6407
Merge pull request #212 from s3h10r/master
...
fixes: attachments in public comments not always shown in public_view_ticket
2014-05-27 09:11:11 +10:00
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
fced647271
Use json instead of deprecated django.utils.simplejson
2014-03-31 14:43:59 -04:00
180599875e
Merge pull request #208 from adamfast/patch-1
...
Update with default for HAS_TAG_SUPPORT
2014-03-05 09:03:18 +11:00
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
d99df4a43e
Merge pull request #206 from gjedeer/patch-1
...
Protocol-independent CDN links
2014-02-20 08:57:20 +11:00
a3831c2e40
Merge pull request #207 from gjedeer/patch-2
...
Protocol-independent CDN links
2014-02-20 08:57:15 +11:00
07a3b91b6f
Protocol-independent CDN links
2014-02-19 16:17:13 +01:00
