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

1836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Garret Wassermann
e2bd1e5cd0
Update travis ci to test both django 2.2 and 3.x 
Update travis ci config to test both django 2.2 and latest 3.x
 2020-10-13 16:50:12 -04:00
Garret Wassermann
80114ef6a8
Update requirements.txt for Django version 
Do not allow Django 4.x+ in requirements, until we can look at it when released and do any necessary updates to support it.
 2020-10-13 15:54:22 -04:00
Garret Wassermann
8e7be70af2
Merge pull request #884 from alligatorbait/master 
update saved_queries imports, filter, and authentication checks, correct created field reference and remove Django version decrement
 2020-10-13 15:52:02 -04: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
Thomas Weber
30dc07d0d7 Remove Django version decrement from requirements.txt 2020-10-13 10:27:43 -06:00
Tom Weber
4e55ddabf3
Merge pull request #3 from django-helpdesk/master 
Merge pull request #883 from alligatorbait/master
 2020-10-13 10:14:00 -06:00
Garret Wassermann
35cde5aa0d
Merge pull request #883 from alligatorbait/master 
Updates required to work with Django 3.x
 2020-10-13 03:42:21 -04: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
Garret Wassermann
6f1ec3e13e Update travis ci testing to use Django 3.1 and Ubuntu 20.04 2020-10-13 03:09:30 -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
Garret Wassermann
68b9977037
Merge pull request #880 from typonaut/patch-7 
Update configuration.rst to add locale information
 2020-10-08 17:16:56 -04: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
Benbb96
c2276ce7e1 Set an absolute path to get the module recognized when running from root folder 2020-10-08 22:05:48 +02:00
typonaut
3e91f35986
Update configuration.rst, again 
Improved documentation on e-mail check interval, added documentation on locale.
 2020-10-08 16:12:35 +01:00
Tom Weber
16667c359e
Merge pull request #2 from django-helpdesk/master 
Apply patch for #853
 2020-10-08 07:08:04 -06: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
Garret Wassermann
535b64454c
Merge pull request #879 from typonaut/patch-6 
Update configuration.rst with information about email check interval
 2020-10-08 01:24:56 -04:00
Garret Wassermann
8fbebb321e
Merge pull request #876 from Benbb96/0.2.x-dev 
Display a Total row in Reports
 2020-10-08 01:22:33 -04:00
typonaut
e83b00674f
Update configuration.rst 
Adds documentation as to the function of "E-Mail Check Interval" and its interaction with a crontab.
 2020-10-08 03:18:50 +01: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
Benbb96
2e9208116b Merge remote-tracking branch 'upstream/master' 2020-10-02 19:11:33 +02:00
Garret Wassermann
22d3a59390 Apply patch for #853 2020-08-30 06:59:48 -04: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
Garret Wassermann
c5d27e8423
Merge pull request #863 from typonaut/patch-5 
Update kb_item.html, Standardises output between KB listing and KB item, captures problem where there may be no votes cast.
 2020-08-19 13:10:33 -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
Garret Wassermann
13925440b3
Merge pull request #860 from hellcheese/missing_endblock 
Added endblock statement to ticket_list.html
 2020-08-18 12:20:09 -04:00
chris hellberg
c66d523f66 Added endblock statement to ticket_list.html 2020-08-18 11:55:45 -04:00
Garret Wassermann
91fca941cd
Merge pull request #856 from hellcheese/cancel_button 
added cancel changes button to edit ticket page
 2020-08-16 16:52:12 -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
Garret Wassermann
3bd00f33cb
Merge pull request #855 from typonaut/patch-3 
Update kb_item.html - fix missing space after colon in header
 2020-08-15 13:26:53 -04:00
Garret Wassermann
79d2167ea4
Merge pull request #853 from typonaut/patch-1 
Update configuration.rst to warn that at least one queue is needed before email can be sent properly
 2020-08-15 13:25:31 -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
typonaut
5d80a689d9
Update configuration.rst 
Added a couple of sentences to explain that creation of a queue is a prerequisite for automatically creating tickets from e-mail.
 2020-08-15 16:16:30 +01:00
Garret Wassermann
6463fbdcd9
Merge pull request #850 from timthelion/patch-1 
Attempted fix for #849
 2020-08-07 11:35:41 -04:00