Garret Wassermann
03c6a5054a
Merge remote-tracking branch 'upstream/master'
2020-12-14 00:39:52 -05:00
Garret Wassermann
662f571d2d
Add accounts/login to urls.py to fix broken url in demo
2020-12-14 00:39:26 -05:00
Garret Wassermann
959fc0f9ba
Merge pull request #911 from koriaf/dev-configurable-file-log
...
ifix(email): Create the log file only if required
2020-12-04 11:08:43 -05:00
Garret Wassermann
87c949859f
Merge pull request #915 from evili/master
...
Add support for standard STARTTLS on port 143 (RFC 2595).
2020-12-04 11:01:39 -05:00
Evili del Rio
baa763c784
Add support for standard STARTTLS on port 143 (RFC 2595).
...
Signed-off-by: Evili del Rio <evili.del.rio@gmail.com>
2020-12-04 11:49:20 +01:00
Arkadiy Korotaev
d2a7bad576
ifix(email): Create the log file only if required
...
+ update some translations
+ update some tests to correctly mock unlink as well
+ fix flake8 errors and sort the imports in email module
+ update some log messages to pass base message + parameters instead of rendered string (works better with Sentry)
2020-11-25 10:31:40 +01:00
Garret Wassermann
b9855ec83f
Merge pull request #909 from koriaf/dev-no-socks-tests
...
fix(tests): Run tests without the socks components and document their usage
2020-11-24 17:32:52 -05:00
Arkadiy Korotaev
4955d983a2
fix(tests): Run tests without the socks components and document their usage
2020-11-24 11:21:51 +01:00
Garret Wassermann
dcdfb1b405
Merge pull request #907 from alligatorbait/master
...
Timeline 3 license added
2020-11-16 11:48:22 -05:00
Tom Weber
07bead0f8f
timeline 3 license
2020-11-16 07:13:56 -07:00
Garret Wassermann
609a31acce
Merge pull request #906 from alligatorbait/master
...
timeline3 can now be used offline or with CDN
2020-11-14 22:13:51 -05:00
Tom Weber
040a0e8d9d
Enable offline content for timeline3 usage
2020-11-14 12:54:10 -07:00
Tom Weber
112b491f78
Merge pull request #7 from django-helpdesk/master
...
Merge pull request #904 from alligatorbait/master
2020-11-14 11:17:54 -07:00
Tom Weber
f1a4b87dbd
Enable offline content for timeline usage
2020-11-14 11:13:26 -07:00
Garret Wassermann
cad87b90b2
Merge pull request #904 from alligatorbait/master
...
Allow users to edit tickets if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE enabled
2020-11-12 23:56:34 -05:00
Tom Weber
87ab8284e2
Allow users to edit tickets if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE enabled
2020-11-12 11:32:12 -07:00
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
