Commit Graph

746 Commits

Author SHA1 Message Date
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
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
rbas
1a743b883f Specify version for django-bootstrap-form 2014-07-09 12:39:15 +02:00
Ross Poulton
fe1bfd1fa4 Replace django.contrib.markup with django-markdown-deux. Closes #219. 2014-07-07 12:10:53 +10:00
Ross Poulton
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
Gabriel Pichot
27217edf4a Changed references from auth.User to get_user_model (views, forms & commands) 2014-06-18 16:21:37 +02:00
Ross Poulton
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
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
Ross Poulton
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
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
Matt Molyneaux
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
Matt Molyneaux
b41eae040d Remove --use-mirrors 2014-06-05 01:07:05 +01:00
Matt Molyneaux
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
Ross Poulton
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
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
Ross Poulton
180599875e Merge pull request #208 from adamfast/patch-1
Update with default for HAS_TAG_SUPPORT
2014-03-05 09:03:18 +11: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
Ross Poulton
a3831c2e40 Merge pull request #207 from gjedeer/patch-2
Protocol-independent CDN links
2014-02-20 08:57:15 +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