Commit Graph

2354 Commits

Author SHA1 Message Date
Garret Wassermann
ce95949c50 Merge 0.2.x bugfix 2020-10-19 17:13:53 -04:00
Garret Wassermann
8bd772db9d
Merge pull request #891 from nitr0man/0.2.x
Fix Exception on sending mails with ticket attaches for non-file storages
2020-10-19 17:09:58 -04:00
Andrew Denisenko
22c07aa18b fix files attaching to emails for remote storages
Storages like S3, Dropbox, etc have no filefield.path() method - so
submitting ticket with attachment leads to exception
2020-10-19 23:08:50 +03:00
nitr0man
b126ccc7b8
Merge pull request #1 from django-helpdesk/0.2.x
sync 0.2.x
2020-10-19 22:47:09 +03: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
Garret Wassermann
39c09d2785
Merge pull request #887 from alligatorbait/master
Update supported Django versions in documentation and correct 2 referenced before set bugs
2020-10-14 19:40:33 -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
alligatorbait
16c70d38cd Update Django versions supported and one format error in file 2020-10-14 15:06:56 -06:00
Tom Weber
b436eab098
Merge pull request #4 from django-helpdesk/master
Merge to match django-helpdesk main
2020-10-14 12:42:09 -06:00
Garret Wassermann
54c7f0be91
Merge pull request #886 from alligatorbait/master
customizable navigation header template for override and documentation update
2020-10-14 13:11:28 -04:00
Garret Wassermann
52ab38af69
Merge pull request #885 from alligatorbait/master
email tests updated to correct references to mock functions
2020-10-14 10:29:32 -04:00
Tom Weber
d21faf77af customizable navigation header documentation 2020-10-13 21:00:24 -06:00
Tom Weber
e03bbe3f65 customizable navigation header documentation 2020-10-13 20:53:31 -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
Garret Wassermann
3054407100
Update requirements for django
Update requirements.txt to allow any Django 2.2 or 3.x release
2020-10-13 16:50:59 -04:00
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