holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • e52471b49b
         Merge pull request #10 from django-helpdesk/master Tom Weber 2021-02-09 12:56:17 -0700
  • 0d0cbacaa7
         Merge pull request #941 from Benbb96/fix-938 Garret Wassermann 2021-02-04 14:20:43 -0500
  • 2a03a5ecf7 Disabled merged_to field in edit ticket + reformat template (fix datepicker) and simplify view bbe 2021-02-04 18:17:06 +0100
  • ce8a7dba1b
         Merge pull request #932 from epineda/fix_celery_decorator_import Garret Wassermann 2021-02-04 04:04:21 -0500
  • 928b63b567
         Merge pull request #939 from alligatorbait/datetime Garret Wassermann 2021-02-04 04:03:20 -0500
  • 88a401f7f8
         Merge pull request #940 from alligatorbait/tool_tips Garret Wassermann 2021-02-03 21:12:22 -0500
  • af8bbbbc3c Replace Knowledge Base "Contact a Human" button with "Create New Ticket" and Queue name with plus-circle icon Tom Weber 2021-02-03 18:36:02 -0700
  • aae12a4ab5 New tooltips added for some icons - assign, edit user, filter tickets by user, and add email to ignore list. Tom Weber 2021-02-03 18:15:17 -0700
  • c4c43b274f Template hard coded date filters replaced with Django DATETIME_FORMAT alligatorbait 2021-02-03 12:59:55 -0700
  • cd86edce8b
         Merge pull request #937 from alligatorbait/datetime Garret Wassermann 2021-02-03 14:33:06 -0500
  • 694b303ebc Formerly RFC 5322 "r" format changed to "DATETIME_FORMAT" Tom Weber 2021-02-03 11:03:45 -0700
  • 8a27d9bbc2
         Merge pull request #9 from alligatorbait/include_js Tom Weber 2021-02-02 17:51:49 -0700
  • 279d8c12e7
         Merge pull request #935 from alligatorbait/include_js Garret Wassermann 2021-02-02 19:41:18 -0500
  • a3cc363981 base_js.html moved to load before code using the resource. Tom Weber 2021-02-02 16:08:35 -0700
  • e9ba600554 Template hard coded date filters removed, use Django DATE_FORMAT for customization. alligatorbait 2021-02-01 13:05:39 -0700
  • 3975046590
         Merge pull request #8 from django-helpdesk/master Tom Weber 2021-02-01 10:46:26 -0700
  • 76f697cad3 Fix import of celery decorator "task". Edgard Pineda 2021-01-31 22:27:37 -0300
  • aeb3bf0762
         Merge pull request #927 from Benbb96/fix-926 Garret Wassermann 2021-01-16 18:00:48 -0500
  • f9d000b953 Fix #926 Benbb96 2021-01-16 23:28:30 +0100
  • 56c3c66a35
         Merge pull request #925 from HugoDelval/patch-1 Garret Wassermann 2021-01-14 12:13:08 -0500
  • bc1c5f6f17
         email templates: small typos in french Hugo DELVAL 2021-01-14 18:06:33 +0100
  • 90c0e11e9f
         Merge pull request #924 from bikeshedder/master Garret Wassermann 2021-01-12 10:11:58 -0500
  • 31a8a9dab4 Update German translation Michael P. Jung 2021-01-12 13:14:23 +0100
  • 0acffeff94 Bump to 0.3.0 beta 3 0.3.0b3 Garret Wassermann 2021-01-04 17:52:01 -0500
  • fcafc77b92
         Merge pull request #919 from Benbb96/fix-double-translation Garret Wassermann 2021-01-04 15:55:01 -0500
  • 6e1a1a7c87
         Merge pull request #920 from Benbb96/fix-login-errors Garret Wassermann 2021-01-04 15:51:20 -0500
  • 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' bbe 2021-01-04 20:02:25 +0100
  • 1eef8496bb Remove translation on the template (since it is already done in the form definition) bbe 2021-01-04 19:58:43 +0100
  • 63790c5b1d
         Update CONTRIBUTING.rst Garret Wassermann 2020-12-22 12:44:29 -0500
  • 03c6a5054a Merge remote-tracking branch 'upstream/master' Garret Wassermann 2020-12-14 00:39:52 -0500
  • 662f571d2d Add accounts/login to urls.py to fix broken url in demo Garret Wassermann 2020-12-14 00:39:26 -0500
  • 959fc0f9ba
         Merge pull request #911 from koriaf/dev-configurable-file-log Garret Wassermann 2020-12-04 11:08:43 -0500
  • 87c949859f
         Merge pull request #915 from evili/master Garret Wassermann 2020-12-04 11:01:39 -0500
  • baa763c784 Add support for standard STARTTLS on port 143 (RFC 2595). Evili del Rio 2020-12-04 11:49:20 +0100
  • 2e867cba87 Remove hard dependency on pinax teams Timothy Hobbs 2020-12-02 01:21:56 +0100
  • d2a7bad576
         ifix(email): Create the log file only if required Arkadiy Korotaev 2020-11-25 10:20:36 +0100
  • b9855ec83f
         Merge pull request #909 from koriaf/dev-no-socks-tests Garret Wassermann 2020-11-24 17:32:52 -0500
  • 4955d983a2
         fix(tests): Run tests without the socks components and document their usage Arkadiy Korotaev 2020-11-24 11:21:51 +0100
  • dcdfb1b405
         Merge pull request #907 from alligatorbait/master Garret Wassermann 2020-11-16 11:48:22 -0500
  • 07bead0f8f timeline 3 license Tom Weber 2020-11-16 07:13:56 -0700
  • 609a31acce
         Merge pull request #906 from alligatorbait/master Garret Wassermann 2020-11-14 22:13:51 -0500
  • 040a0e8d9d Enable offline content for timeline3 usage Tom Weber 2020-11-14 12:53:24 -0700
  • 112b491f78
         Merge pull request #7 from django-helpdesk/master Tom Weber 2020-11-14 11:17:54 -0700
  • f1a4b87dbd Enable offline content for timeline usage Tom Weber 2020-11-14 11:13:26 -0700
  • cad87b90b2
         Merge pull request #904 from alligatorbait/master Garret Wassermann 2020-11-12 23:56:34 -0500
  • 87ab8284e2 Allow users to edit tickets if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE enabled Tom Weber 2020-11-12 11:32:12 -0700
  • 54796e5c4b Allow users to edit tickets if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE enabled Tom Weber 2020-11-12 07:59:23 -0700
  • c03e553ee3
         Merge pull request #5 from django-helpdesk/master Tom Weber 2020-11-12 07:52:56 -0700
  • f15442f599 Use pinax-teams 2.0.0 and bump to beta 2 for pypi Garret Wassermann 2020-11-12 02:50:09 -0500
  • 4d83067826 Merge bugfixes from 'upstream/master' 0.3.0b1 Garret Wassermann 2020-11-12 02:17:10 -0500
  • 6b2026fb2a Set versions and python metadata for first beta release of 0.3.0 Garret Wassermann 2020-11-12 02:16:44 -0500
  • 86349e8e4f Update versions for next bugfix release 0.2.23 Garret Wassermann 2020-11-12 02:05:08 -0500
  • c8980b3392
         Merge pull request #901 from koriaf/master Garret Wassermann 2020-11-10 19:51:26 -0500
  • e9a2313d93
         fix(migrations): Rename the migration back due to InconsistentMigrationHistory otherwise Arkadiy Korotaev 2020-11-10 18:24:16 +0100
  • 6dd3b07dad
         fix(migrations): Fix the 0034 migration for Postgres Arkadiy Korotaev 2020-11-10 17:41:10 +0100
  • 455dd0ab2e
         Merge pull request #898 from Benbb96/fix-ticket-list Garret Wassermann 2020-11-05 14:41:48 -0500
  • bbdd1844f7 Fix translations bbe 2020-11-05 17:16:35 +0100
  • 315cd34864 Create helpdesk-customize to remove 404 error in console. bbe 2020-11-05 16:47:56 +0100
  • ba5847b5bd Disable Date Range option in Filter Box if the to_date already provided bbe 2020-11-05 16:47:32 +0100
  • f68826496b Fix the filterBuilderRemove and update var keyword to let or const bbe 2020-11-05 16:46:09 +0100
  • 77ab80672f Reformat ticket_list.html bbe 2020-11-05 16:39:30 +0100
  • c9fa0c81c7
         Merge pull request #895 from Benbb96/merging-tickets-feature Garret Wassermann 2020-11-01 13:54:03 -0500
  • b7070db718
         Merge pull request #896 from Benbb96/enhance-ticketcc Garret Wassermann 2020-10-31 15:27:08 -0400
  • 4c0b9b073b revert blocktrans indenting bbe 2020-10-31 18:41:31 +0100
  • 1788f2fb84 Update ticketCC views and also reformat HTML files along with some improvements in form errors. bbe 2020-10-31 18:33:41 +0100
  • 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. bbe 2020-10-31 18:24:22 +0100
  • 177ba8f963 Add test for the add_email_to_ticketcc_if_not_in ticket function bbe 2020-10-31 17:54:29 +0100
  • 391cc000b8 Better display for table heading bbe 2020-10-31 00:59:28 +0100
  • ad55d54f2d Update french translations bbe 2020-10-31 00:13:25 +0100
  • 1b8a11f74b Create test for the merge view bbe 2020-10-30 23:17:40 +0100
  • b3bd23dbff Add assigned_to attribute to be merged bbe 2020-10-30 23:12:09 +0100
  • 41b5715b7d Add comments and refactor variables names bbe 2020-10-30 22:18:08 +0100
  • 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. bbe 2020-10-30 20:19:50 +0100
  • da5028d51a Redirect e-mail for a merged ticket to the ticket it has been merged to bbe 2020-10-30 19:59:16 +0100
  • ffc51f5e8e Show line breaks in custom field values (when multi lines) bbe 2020-10-30 19:58:01 +0100
  • e8f6756750 Add newline in text part before the footer when sending mail bbe 2020-10-30 19:57:23 +0100
  • 5fce1964de Add email template "merged" thanks to a migration and add merged_to field into the safe ticket context. bbe 2020-10-30 19:56:38 +0100
  • 41c1e765c2 add default empty when a ticket custom field value is null bbe 2020-10-29 23:33:22 +0100
  • 49735dbcda Reformat ticket page and show in which ticket it has been merged to bbe 2020-10-29 23:32:51 +0100
  • 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. bbe 2020-10-29 23:32:02 +0100
  • 9795167d9b Add merged_to information to ticket bbe 2020-10-29 23:29:16 +0100
  • 79d8046694
         Merge pull request #894 from Benbb96/master Garret Wassermann 2020-10-23 12:56:08 -0400
  • 64a3b146d3 Merge branch 'master' of https://github.com/django-helpdesk/django-helpdesk into master bbe 2020-10-23 16:40:13 +0200
  • 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. bbe 2020-10-23 16:24:35 +0200
  • 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. bbe 2020-10-23 16:23:47 +0200
  • fe785bd701
         Merge pull request #893 from Benbb96/fix-739 Garret Wassermann 2020-10-23 09:30:45 -0400
  • dc503b0437 Fix #739 bbe 2020-10-23 14:51:53 +0200
  • ab5e07e295
         Merge pull request #892 from Benbb96/master Garret Wassermann 2020-10-20 12:11:10 -0400
  • ea558d71f3 Display custom fields with bootstrap form-control css class bbe 2020-06-03 10:21:43 +0200
  • ce95949c50 Merge 0.2.x bugfix Garret Wassermann 2020-10-19 17:13:53 -0400
  • 8bd772db9d
         Merge pull request #891 from nitr0man/0.2.x Garret Wassermann 2020-10-19 17:09:58 -0400
  • 22c07aa18b fix files attaching to emails for remote storages Andrew Denisenko 2020-10-19 23:04:50 +0300
  • b126ccc7b8
         Merge pull request #1 from django-helpdesk/0.2.x nitr0man 2020-10-19 22:47:09 +0300
  • c0f1370974 Remove merge text accidentally left in, for #889 Garret Wassermann 2020-10-15 14:35:33 -0400
  • 46b7f78968 Update web dependencies: jquery, fontawesome, bootstrap Garret Wassermann 2020-10-14 23:41:43 -0400
  • 39c09d2785
         Merge pull request #887 from alligatorbait/master Garret Wassermann 2020-10-14 19:40:33 -0400
  • eca0f16806 bug fix data may be referenced when not set alligatorbait 2020-10-14 16:58:37 -0600
  • 628b734451 bug fix ak.baseurl set before ak initialized alligatorbait 2020-10-14 16:46:41 -0600
  • 16c70d38cd Update Django versions supported and one format error in file alligatorbait 2020-10-14 15:06:56 -0600
  • b436eab098
         Merge pull request #4 from django-helpdesk/master Tom Weber 2020-10-14 12:42:09 -0600