bbe
|
ad55d54f2d
|
Update french translations
|
2020-10-31 00:15:51 +01:00 |
|
bbe
|
1b8a11f74b
|
Create test for the merge view
|
2020-10-30 23:17:40 +01:00 |
|
bbe
|
b3bd23dbff
|
Add assigned_to attribute to be merged
|
2020-10-30 23:12:09 +01:00 |
|
bbe
|
41b5715b7d
|
Add comments and refactor variables names
|
2020-10-30 22:19:21 +01:00 |
|
bbe
|
00a18d8f54
|
Restrict possible tickets to merge to the ones that haven't been already merged.
Also check that all selected tickets are within the same queue.
|
2020-10-30 20:19:50 +01:00 |
|
bbe
|
da5028d51a
|
Redirect e-mail for a merged ticket to the ticket it has been merged to
|
2020-10-30 19:59:16 +01:00 |
|
bbe
|
ffc51f5e8e
|
Show line breaks in custom field values (when multi lines)
|
2020-10-30 19:58:01 +01:00 |
|
bbe
|
e8f6756750
|
Add newline in text part before the footer when sending mail
|
2020-10-30 19:57:23 +01:00 |
|
bbe
|
5fce1964de
|
Add email template "merged" thanks to a migration and add merged_to field into the safe ticket context.
|
2020-10-30 19:56:38 +01:00 |
|
bbe
|
41c1e765c2
|
add default empty when a ticket custom field value is null
|
2020-10-29 23:33:22 +01:00 |
|
bbe
|
49735dbcda
|
Reformat ticket page and show in which ticket it has been merged to
|
2020-10-29 23:32:51 +01:00 |
|
bbe
|
e1cd9d0f2e
|
Implement ticket merge feature in ticket list. Create intermediate page to choose which data and custom field values to keep on the main ticket.
Also add new template tag filter to use the dictionary get function in template.
|
2020-10-29 23:32:02 +01:00 |
|
bbe
|
9795167d9b
|
Add merged_to information to ticket
|
2020-10-29 23:29:16 +01:00 |
|
Garret Wassermann
|
79d8046694
|
Merge pull request #894 from Benbb96/master
Improvements in Public part, to address issues with setting due date on a ticket, for #750
|
2020-10-23 12:56:08 -04:00 |
|
bbe
|
64a3b146d3
|
Merge branch 'master' of https://github.com/django-helpdesk/django-helpdesk into master
|
2020-10-23 16:40:13 +02:00 |
|
bbe
|
58a5387779
|
Show Due date on public view ticket if it is set.
Also change default to empty string when a custom field value is None.
|
2020-10-23 16:24:35 +02:00 |
|
bbe
|
4ee74e6667
|
Better public create ticket form with the initialization of the datepicker for due date as a media.
Reformat code to improve readability.
Add an include to get an alert when there are errors in a form.
|
2020-10-23 16:23:47 +02:00 |
|
Garret Wassermann
|
fe785bd701
|
Merge pull request #893 from Benbb96/fix-739
Redirect to dashboard after deleting a ticket from there, to fix #739
|
2020-10-23 09:30:45 -04:00 |
|
bbe
|
dc503b0437
|
Fix #739
|
2020-10-23 14:51:53 +02:00 |
|
Garret Wassermann
|
ab5e07e295
|
Merge pull request #892 from Benbb96/master
Display custom fields with bootstrap `form-control` css class
|
2020-10-20 12:11:10 -04:00 |
|
bbe
|
ea558d71f3
|
Display custom fields with bootstrap form-control css class
|
2020-10-20 11:51:55 +02:00 |
|
Garret Wassermann
|
ce95949c50
|
Merge 0.2.x bugfix
|
2020-10-19 17:13:53 -04:00 |
|
Garret Wassermann
|
8bd772db9d
|
Merge pull request #891 from nitr0man/0.2.x
Fix Exception on sending mails with ticket attaches for non-file storages
|
2020-10-19 17:09:58 -04:00 |
|
Andrew Denisenko
|
22c07aa18b
|
fix files attaching to emails for remote storages
Storages like S3, Dropbox, etc have no filefield.path() method - so
submitting ticket with attachment leads to exception
|
2020-10-19 23:08:50 +03:00 |
|
nitr0man
|
b126ccc7b8
|
Merge pull request #1 from django-helpdesk/0.2.x
sync 0.2.x
|
2020-10-19 22:47:09 +03:00 |
|
Garret Wassermann
|
c0f1370974
|
Remove merge text accidentally left in, for #889
|
2020-10-15 14:35:33 -04:00 |
|
Garret Wassermann
|
46b7f78968
|
Update web dependencies: jquery, fontawesome, bootstrap
|
2020-10-14 23:41:43 -04:00 |
|
Garret Wassermann
|
39c09d2785
|
Merge pull request #887 from alligatorbait/master
Update supported Django versions in documentation and correct 2 referenced before set bugs
|
2020-10-14 19:40:33 -04:00 |
|
alligatorbait
|
eca0f16806
|
bug fix data may be referenced when not set
|
2020-10-14 16:58:37 -06:00 |
|
alligatorbait
|
628b734451
|
bug fix ak.baseurl set before ak initialized
|
2020-10-14 16:46:41 -06:00 |
|
alligatorbait
|
16c70d38cd
|
Update Django versions supported and one format error in file
|
2020-10-14 15:06:56 -06:00 |
|
Tom Weber
|
b436eab098
|
Merge pull request #4 from django-helpdesk/master
Merge to match django-helpdesk main
|
2020-10-14 12:42:09 -06:00 |
|
Garret Wassermann
|
54c7f0be91
|
Merge pull request #886 from alligatorbait/master
customizable navigation header template for override and documentation update
|
2020-10-14 13:11:28 -04:00 |
|
Garret Wassermann
|
52ab38af69
|
Merge pull request #885 from alligatorbait/master
email tests updated to correct references to mock functions
|
2020-10-14 10:29:32 -04:00 |
|
Tom Weber
|
d21faf77af
|
customizable navigation header documentation
|
2020-10-13 21:00:24 -06:00 |
|
Tom Weber
|
e03bbe3f65
|
customizable navigation header documentation
|
2020-10-13 20:53:31 -06:00 |
|
Tom Weber
|
b33ee08d5d
|
customizable navigation header template available for override
|
2020-10-13 20:12:09 -06:00 |
|
Tom Weber
|
14b53bb498
|
Updated references to functions being tested and corrected test named test_get_email_quiet_option
|
2020-10-13 18:30:01 -06:00 |
|
Garret Wassermann
|
3054407100
|
Update requirements for django
Update requirements.txt to allow any Django 2.2 or 3.x release
|
2020-10-13 16:50:59 -04:00 |
|
Garret Wassermann
|
e2bd1e5cd0
|
Update travis ci to test both django 2.2 and 3.x
Update travis ci config to test both django 2.2 and latest 3.x
|
2020-10-13 16:50:12 -04:00 |
|
Garret Wassermann
|
80114ef6a8
|
Update requirements.txt for Django version
Do not allow Django 4.x+ in requirements, until we can look at it when released and do any necessary updates to support it.
|
2020-10-13 15:54:22 -04:00 |
|
Garret Wassermann
|
8e7be70af2
|
Merge pull request #884 from alligatorbait/master
update saved_queries imports, filter, and authentication checks, correct created field reference and remove Django version decrement
|
2020-10-13 15:52:02 -04:00 |
|
Thomas Weber
|
58a23fed13
|
Check user is authenticated and usersettings_helpdesk model is created before attempting to read a tickets_per_page, otherwise use default value
|
2020-10-13 13:01:18 -06:00 |
|
Thomas Weber
|
d3cb9fdf23
|
Corrected date_created field to current created field as it exists in models.py
|
2020-10-13 11:20:58 -06:00 |
|
Thomas Weber
|
39d810778a
|
filter import updated to Django recommended syntax, changed to decorator, and only filter user field if authenticated
|
2020-10-13 11:20:09 -06:00 |
|
Thomas Weber
|
30dc07d0d7
|
Remove Django version decrement from requirements.txt
|
2020-10-13 10:27:43 -06:00 |
|
Tom Weber
|
4e55ddabf3
|
Merge pull request #3 from django-helpdesk/master
Merge pull request #883 from alligatorbait/master
|
2020-10-13 10:14:00 -06:00 |
|
Garret Wassermann
|
35cde5aa0d
|
Merge pull request #883 from alligatorbait/master
Updates required to work with Django 3.x
|
2020-10-13 03:42:21 -04:00 |
|
Garret Wassermann
|
df4024dbb3
|
Merge branch 'master' into master
|
2020-10-13 03:38:36 -04:00 |
|
Garret Wassermann
|
c9e0a51d78
|
Merge pull request #881 from Benbb96/fix-errors-on-master
Fix errors on 0.3.x branch especially relating to django 3.x
|
2020-10-13 03:35:42 -04:00 |
|