Tom Weber
|
54796e5c4b
|
Allow users to edit tickets if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE enabled
|
2020-11-12 07:59:23 -07:00 |
|
Tom Weber
|
c03e553ee3
|
Merge pull request #5 from django-helpdesk/master
Merge to head on master
|
2020-11-12 07:52:56 -07:00 |
|
Garret Wassermann
|
f15442f599
|
Use pinax-teams 2.0.0 and bump to beta 2 for pypi
|
2020-11-12 02:50:09 -05:00 |
|
Garret Wassermann
|
4d83067826
|
Merge bugfixes from 'upstream/master'
|
2020-11-12 02:17:10 -05:00 |
|
Garret Wassermann
|
6b2026fb2a
|
Set versions and python metadata for first beta release of 0.3.0
|
2020-11-12 02:16:44 -05:00 |
|
Garret Wassermann
|
c8980b3392
|
Merge pull request #901 from koriaf/master
fix(migrations): Fix the 0034 migration for Postgres
|
2020-11-10 19:51:26 -05:00 |
|
Arkadiy Korotaev
|
e9a2313d93
|
fix(migrations): Rename the migration back due to InconsistentMigrationHistory otherwise
|
2020-11-10 18:24:16 +01:00 |
|
Arkadiy Korotaev
|
6dd3b07dad
|
fix(migrations): Fix the 0034 migration for Postgres
|
2020-11-10 17:41:10 +01:00 |
|
Garret Wassermann
|
455dd0ab2e
|
Merge pull request #898 from Benbb96/fix-ticket-list
Fix Ticket List, to address #897
|
2020-11-05 14:41:48 -05:00 |
|
bbe
|
bbdd1844f7
|
Fix translations
|
2020-11-05 17:17:11 +01:00 |
|
bbe
|
315cd34864
|
Create helpdesk-customize to remove 404 error in console.
|
2020-11-05 16:47:56 +01:00 |
|
bbe
|
ba5847b5bd
|
Disable Date Range option in Filter Box if the to_date already provided
|
2020-11-05 16:47:32 +01:00 |
|
bbe
|
f68826496b
|
Fix the filterBuilderRemove and update var keyword to let or const
|
2020-11-05 16:46:09 +01:00 |
|
bbe
|
77ab80672f
|
Reformat ticket_list.html
|
2020-11-05 16:39:30 +01:00 |
|
Garret Wassermann
|
c9fa0c81c7
|
Merge pull request #895 from Benbb96/merging-tickets-feature
New feature: Merging tickets
|
2020-11-01 13:54:03 -05:00 |
|
Garret Wassermann
|
b7070db718
|
Merge pull request #896 from Benbb96/enhance-ticketcc
Improvements in Ticketcc views and templates
|
2020-10-31 15:27:08 -04:00 |
|
bbe
|
4c0b9b073b
|
revert blocktrans indenting
|
2020-10-31 18:41:31 +01:00 |
|
bbe
|
1788f2fb84
|
Update ticketCC views and also reformat HTML files along with some improvements in form errors.
|
2020-10-31 18:33:41 +01:00 |
|
bbe
|
7564c5739b
|
Add a clean method on TicketCC model in order to be sure not to add a user who doesn't have an email address.
|
2020-10-31 18:24:22 +01:00 |
|
bbe
|
177ba8f963
|
Add test for the add_email_to_ticketcc_if_not_in ticket function
|
2020-10-31 17:54:29 +01:00 |
|
bbe
|
391cc000b8
|
Better display for table heading
|
2020-10-31 00:59:28 +01:00 |
|
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 |
|