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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
alligatorbait
|
937a048a9b
|
Updated load static in templates to current syntax
|
2020-10-12 16:30:25 -06:00 |
|
alligatorbait
|
f9f975932b
|
available_attrs was removed from Django as it was only used as a Python 2 bug workaround
|
2020-10-12 16:11:07 -06:00 |
|
alligatorbait
|
e50225a67c
|
remove missing import and usage of apply_query
|
2020-10-12 15:57:00 -06:00 |
|
Garret Wassermann
|
6b335590e6
|
Merge bugfixes from 0.2.23-devel
|
2020-10-12 03:19:46 -04:00 |
|
Garret Wassermann
|
5d70fc167d
|
Merge pull request #882 from TurnrDev/hotfix/migrations
Missing Migrations for 0.2.22 for boolean fields
|
2020-10-11 13:22:35 -04:00 |
|
Jay Turner
|
306446b389
|
Fixes a missing migrations messages in 0.2.22 which is caused by the careless changing of strings in models
|
2020-10-10 13:28:27 +01:00 |
|
Benbb96
|
37713db32a
|
Show username of ticket's owner in ticket_list if user has no full name nor email
|
2020-10-08 22:47:52 +02:00 |
|