holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,104 Commits 1 Branch 37 Tags 26 MiB
08654bd9c4
Commit Graph

1292 Commits

Author SHA1 Message Date
Tom Weber
1271f00278 String Check, catch NoneType error 2021-02-24 07:19:37 -07:00
Tom Weber
d06626c0d6 Bug Fix test for string check 2021-02-10 18:09:46 -07:00
Tom Weber
90961897ec CustomField datetime type formats updated to fixed string formats enabling reformatting and consistency 2021-02-10 17:58:01 -07:00
Tom Weber
ae9109bad6 Bug Fix EditTicketForm unable to edit and add error display 2021-02-09 13:08:27 -07:00
Garret Wassermann
0d0cbacaa7
Merge pull request #941 from Benbb96/fix-938 
Disabled merged_to field in edit ticket + Fix datepicker
 2021-02-04 14:20:43 -05:00
bbe
2a03a5ecf7 Disabled merged_to field in edit ticket + reformat template (fix datepicker) and simplify view 2021-02-04 18:17:06 +01:00
Garret Wassermann
ce8a7dba1b
Merge pull request #932 from epineda/fix_celery_decorator_import 
Fix import of celery decorator "task" to work with celery 5
 2021-02-04 04:04:21 -05:00
Garret Wassermann
928b63b567
Merge pull request #939 from alligatorbait/datetime 
Template hard coded date filters replaced with Django DATETIME_FORMAT
 2021-02-04 04:03:20 -05:00
Garret Wassermann
88a401f7f8
Merge pull request #940 from alligatorbait/tool_tips 
Tool tips improved, KB Contact Human Button replaced
 2021-02-03 21:12:22 -05:00
Tom Weber
af8bbbbc3c Replace Knowledge Base "Contact a Human" button with "Create New Ticket" and Queue name with plus-circle icon 2021-02-03 18:36:02 -07:00
Tom Weber
aae12a4ab5 New tooltips added for some icons - assign, edit user, filter tickets by user, and add email to ignore list. 2021-02-03 18:15:17 -07:00
alligatorbait
c4c43b274f Template hard coded date filters replaced with Django DATETIME_FORMAT 2021-02-03 12:59:55 -07:00
Garret Wassermann
cd86edce8b
Merge pull request #937 from alligatorbait/datetime 
Formerly RFC 5322 "r" format changed to "DATETIME_FORMAT"
 2021-02-03 14:33:06 -05:00
Tom Weber
694b303ebc Formerly RFC 5322 "r" format changed to "DATETIME_FORMAT" 2021-02-03 11:03:45 -07:00
Tom Weber
a3cc363981 base_js.html moved to load before code using the resource. 2021-02-02 16:08:35 -07:00
alligatorbait
e9ba600554 Template hard coded date filters removed, use Django DATE_FORMAT for customization. 2021-02-01 13:05:39 -07:00
Edgard Pineda
76f697cad3 Fix import of celery decorator "task". 2021-01-31 22:27:37 -03:00
Benbb96
f9d000b953 Fix #926 2021-01-16 23:28:30 +01:00
Hugo DELVAL
bc1c5f6f17
email templates: small typos in french 2021-01-14 18:06:33 +01:00
Michael P. Jung
31a8a9dab4 Update German translation 2021-01-12 13:40:49 +01:00
Garret Wassermann
fcafc77b92
Merge pull request #919 from Benbb96/fix-double-translation 
Fix double translating in Create Ticket Form
 2021-01-04 15:55:01 -05:00
bbe
cdfc895bce Fix the login url by using view names in the demo settings instead of the hardcoded urls. 
Also remove a duplicate url for 'login'
 2021-01-04 20:02:25 +01:00
bbe
1eef8496bb Remove translation on the template (since it is already done in the form definition) 2021-01-04 19:58:43 +01:00
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
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
Timothy Hobbs
2e867cba87 Remove hard dependency on pinax teams 2020-12-02 01:26:53 +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
Arkadiy Korotaev
4955d983a2
fix(tests): Run tests without the socks components and document their usage 2020-11-24 11:21:51 +01:00
Tom Weber
040a0e8d9d Enable offline content for timeline3 usage 2020-11-14 12:54:10 -07:00
Tom Weber
f1a4b87dbd Enable offline content for timeline usage 2020-11-14 11:13:26 -07: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
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
Benbb96
5b44a3aca6 Fix an error when creating a ticket with a submitter email that is shared by multiple users 2020-10-08 22:34:45 +02:00
Benbb96
d7f4ca4137 Fix the call the user setting for tickets per page 2020-10-08 22:34:40 +02:00
Benbb96
d80c70735a Remove unused imports and fix errors like variables which were removed or renamed or call to function apply_query which doesn't exist anymore. 2020-10-08 22:07:49 +02:00
Garret Wassermann
720860fe54
Merge pull request #869 from alligatorbait/0.2.x 
Verify ticket.assigned_to is set before attempting to access id property
 2020-10-08 01:26:10 -04:00
Benbb96
ecc7dcdc17 Fix tests 2020-10-08 00:48:03 +02:00
bbe
bcec57dafe Display total row in report output. 2020-10-05 11:15:22 +02:00
Thomas Weber
b772c6097b Verify ticket.assigned_to is set before attempting to access id property 2020-08-25 16:11:50 -06:00
Garret Wassermann
0774692742
Merge pull request #862 from typonaut/patch-4 
Update kb_category.html, Standardises output between KB listing and KB items rating display (so that both are "n/10", where the listing was previously a float), and captures case where there may be no votes cast.
 2020-08-19 13:11:32 -04:00
typonaut
ff171e3c38
Update kb_item.html 
Standardises output between KB listing and KB item, captures problem where there may be no votes cast.
 2020-08-19 18:07:46 +01:00
typonaut
67bd484a35
Update kb_category.html 
Standardises output between KB listing and KB items rating display (so that both are "n/10", where the listing was previously a float), and captures case where there may be no votes cast.
 2020-08-19 18:02:20 +01:00
chris hellberg
c66d523f66 Added endblock statement to ticket_list.html 2020-08-18 11:55:45 -04:00
chris hellberg
e6847e916e added cancel changes button to edit ticket page 2020-08-16 14:49:30 -04:00
Garret Wassermann
41b9f38ab6
Merge pull request #854 from typonaut/patch-2 
Update kb_category.html - space after colon in H2 heading.
 2020-08-15 13:28:06 -04:00
typonaut
604306d738
Update kb_item.html 
Fixed a minor typo: space after colon in H2 heading
 2020-08-15 16:30:58 +01:00
typonaut
eef16be1a4
Update kb_category.html 
Fixed a minor typo: space after colon in H2 heading.
 2020-08-15 16:28:29 +01:00
Timothy Hobbs
ba321462c3
Attempted fix for #849 
Probably fixes #849
 2020-08-07 13:03:16 +02:00
Garret Wassermann
2f788f2597 Merge 0.2.22 bugfix release updates, update copyright year in license, specify python 3.6 or above in setup 2020-07-30 04:46:15 -04:00
Garret Wassermann
2a3fc0894d Rename and document the maximum email attachment size setting, to address #846 2020-07-30 02:54:03 -04:00
Garret Wassermann
981eb323c2 Try a real fix for #832, parse comma in email sender 2020-07-30 02:43:27 -04:00
Derek Chen
0c85a0d2a8 fix Chinese spell and add some messages 2020-07-30 12:00:09 +08:00
Garret Wassermann
6a73fd7cef Better handling of sender email 2020-07-27 21:47:32 -04:00
Garret Wassermann
03ab0eb438 Pycodestyle fixes 2020-07-27 20:49:31 -04:00
Garret Wassermann
7eae003e5d Use python getadddresses() function to better handle UTF-8, to address #832 2020-07-27 20:43:05 -04:00
Garret Wassermann
0a712381e0 Set default attachment permissions to 0700, to address #591 2020-07-27 19:50:25 -04:00
Arkadiy Korotaev
cf98b4a8e9
fix(public): Fix the public ticket creation by passing user or None to the form.save() method 2020-07-20 16:43:55 +02:00
Garret Wassermann
fcde14b82c Fix pycodestyle warnings 2020-07-20 08:10:10 -04:00
Garret Wassermann
46a5982184 ensure log handler is freed, #844 2020-07-20 08:05:35 -04:00
Garret Wassermann
c5226e983e
Merge pull request #844 from koriaf/dev-log-handler 
fix<process_email>: free the log file handler after it's not used anymore
 2020-07-20 07:58:05 -04:00
Garret Wassermann
ee4b32254f
Merge pull request #837 from Benbb96/patch-1 
Fix javascript buttons for bulk select all/none/inverse in ticket_list by using prop() instead of attr()
 2020-07-07 11:53:13 -04:00
Benbb96
95feded289
Update ticket_list.html 
Fix Keyword filter box which didn't show up even if it is in saved query.
 2020-07-07 11:04:31 +02:00
bbe
d961b2b692 Fix KnowledgeBase item score 2020-06-29 14:47:37 +02:00
Benbb96
1765eb7004
Update ticket_list.html 
Fix javascript buttons for bulk select all/none/inverse
 2020-06-19 10:05:29 +02:00
bbe
ff77aa0fe3 A ticket cannot depends on itself or on a ticket already depending on it 2020-06-12 15:34:39 +02:00
bbe
bec486817c Add "Shared" to translation 2020-06-10 11:35:45 +02:00
bbe
4cdea81ae7 Fix a bug with the field label in the ticket form creation. It was translated twice. 2020-06-09 17:31:31 +02:00
bbe
5775de5c4e Add "here" word in translations 2020-06-09 16:29:18 +02:00
bbe
220566caf3 Compile French Translations 2020-06-09 16:21:38 +02:00
bbe
25a2e5130b Update French Translations 2020-06-09 16:18:09 +02:00
bbe
812f711da7 Fix HTML format error in french templates. 
Change the date format.
Replace Unknown by Inconnu.
Remove extra whitespace.
Correct some french translations.

Correct an error in the "closed_cc" template for every languages.
 2020-06-05 11:26:41 +02:00
Tom Bernens
7dcbe69090 missing a couple " 2020-06-01 17:52:20 -07:00
Tom Bernens
041f707dba forgot end with 2020-06-01 17:50:42 -07:00
Tom Bernens
5f910a72e0 forgot an add 2020-06-01 17:49:50 -07:00
Tom Bernens
1ea2a9cba9 no message 2020-06-01 17:49:10 -07:00
Tom Bernens
9461705591 I was over thinking that 2020-06-01 17:47:54 -07:00
Tom Bernens
a85223e7a5 only create the control if the page number is in the paginator range 2020-06-01 17:20:11 -07:00
Tom Bernens
c854ff764a add -5? 2020-06-01 17:11:33 -07:00
Tom Bernens
b1914bad14 template language arithmatic 2020-06-01 17:08:30 -07:00
Tom Bernens
df6a8a3778 add first and last page controls 2020-06-01 17:06:44 -07:00
Tom Bernens
d9cb76d491 django template syntax (as instead of =) 2020-06-01 16:50:20 -07:00
Tom Bernens
050a65e6df reduce this to only ever show 11 pages (5 before and 5 after the current + the current)) 2020-06-01 16:49:13 -07:00
Tom Bernens
e1b9906fd0 forgot some '%' cause im a big 'ol dummy 2020-06-01 16:22:16 -07:00
Tom Bernens
e10ffce24a more safely get the user setting for tickets per page 2020-06-01 16:20:33 -07:00
Tom Bernens
03760a921e initial commit 
staff.py changes:
import django core paginator libs
get user setting for tickets per page
get http GET variables for page selection on three tables
use django paginator to get current page tickets only, and pass those to dashboard.html instead of all tickets

dashboard.html changes:
assign the correct HTTP GET argument to each table

tickets.html changes:
add pagination controls below table div, and pass HTTP GET args back to the URL when clicked
 2020-06-01 16:14:55 -07:00
Garret Wassermann
3ab599d141
Merge pull request #816 from kajala/feature/l10n-fi 
Finnish (fi) translation
 2020-04-22 07:08:44 -04:00
Jani Kajala
96f631f1c5 "Overview" not using trans in templates dashboard.html, kb_index.html, ticket_list.html 2020-04-21 16:25:26 -05:00
Jani Kajala
dcf5b8acf9 Finnish (fi) email templates to emailtemplate.json 2020-04-21 16:04:13 -05:00
Jani Kajala
272768d2c8 Finnish (fi) .po localization 2020-04-21 16:03:49 -05:00
Garret Wassermann
8a521d563b Fix pycodestyle error 2020-04-15 07:42:52 -04:00
Garret Wassermann
5ad0743722 Merge in 0.2.21 bugfix 2020-04-15 07:38:52 -04:00
Garret Wassermann
19895921a5
Merge pull request #805 from nitr0man/0.2.x 
Fill followup user field if authenticated user submits ticket
 2020-04-15 06:46:55 -04:00
Mike Hoolehan
266775dbf6
Update get_email.py 2020-03-18 09:11:48 +02:00
Garret Wassermann
0e9358e61b
Merge pull request #803 from auto-mat/teams 
Add Teams functionality, using pinax-teams
 2020-03-04 01:02:40 -05:00
Andrew Denisenko
2f4d91c22d Fill followup user field if authenticated user submits ticket 2020-03-03 23:39:02 +02:00
Petr Dlouhý
81f835b77b fix KBItem choose form 2020-02-27 11:54:04 +01:00
Petr Dlouhý
29e73158b4 make question stronger 2020-02-26 10:49:28 +01:00
Petr Dlouhý
782dd86680 add doctype to iframes 2020-02-26 10:49:28 +01:00