Commit Graph

2156 Commits

Author SHA1 Message Date
Nick McCullum
80a4c05475 another try 2022-03-16 19:17:49 -04:00
Nick McCullum
564a4539f0 Updated requirements to be Django 4 compatible 2022-03-16 19:15:23 -04:00
Nick McCullum
52d7d6db45 Update requirements file 2022-03-16 18:57:50 -04:00
Garret Wassermann
909b7a5533
Merge pull request #999 from afranjin/bugfix/#998-user-settings-model-filed-name-typo
bugfix/#998-user-settings-model-filed-name-typo
2022-03-11 17:36:31 -05:00
Garret Wassermann
36b4b07796
Merge pull request #1001 from afranjin/bugfix/#1000-ticket-dependency-confirm-delete
Fix wrong href in ticket dependency
2022-03-11 17:28:39 -05:00
Antun Franjin
b79d46e5b6 Replace href. 2022-03-11 15:46:20 +01:00
Antun Franjin
3ea2d1dd50 Use ticket absolute url and fix some more path on navigation ticket href. 2022-03-11 13:14:01 +01:00
Antun Franjin
3d793218f2 Fix wrong href.
The href path of don't delete button needs to be ../../../
2022-03-11 12:16:14 +01:00
Antun Franjin
fbadf23654 Fix typo in model field name in update_ticket.
email_on_ticket_assigned > email_on_ticket_assign
2022-03-11 11:03:16 +01:00
Garret Wassermann
7bcee909ef
give duplicate test a slightly more descriptive unique name 2022-02-22 01:13:24 -05:00
Garret Wassermann
ba80fd1286
Merge pull request #996 from code-review-doctor/fix-duplicate-test-names
Some tests are skipped due to duplicate names fix
2022-02-22 01:11:09 -05:00
code-review-doctor
3206fd61c9 Fix issue duplicate-test-names found at https://codereview.doctor 2022-02-21 09:48:57 +00:00
Garret Wassermann
b85a84bc37 Update CDN link for bootstrap css 2022-02-09 05:50:03 -05:00
Garret Wassermann
ad37318c2c Update CDN links for jquery and bootstrap 2022-02-09 05:39:53 -05:00
Garret Wassermann
6ea9009dda Update jquery to 3.6.0 2022-02-09 05:32:00 -05:00
Garret Wassermann
ad519a2018 Reverse to latest bootstrap 4, which is 4.6.1 2022-02-09 05:29:22 -05:00
Garret Wassermann
4df831d4d6 Update bootstrap css to 5.1.3 2022-02-09 05:21:31 -05:00
Garret Wassermann
e0c0754543 Update to fontawesome 5.15.4 2022-02-09 05:15:14 -05:00
Garret Wassermann
075cdd4cdb
Merge pull request #991 from Benbb96/active-sidebar
Show active page in sidebar depending on the request path url
2022-01-27 07:58:48 -05:00
Garret Wassermann
2a8c1511ef
Merge pull request #990 from auto-mat/preset
Undo PR #989
2022-01-27 07:56:15 -05:00
Timothy Hobbs
17a1e064e6 Undo PR #989 2022-01-27 10:27:49 +01:00
Benbb96
a2782c07f4 Show active page in sidebar depending on the request path url 2022-01-27 09:51:00 +01:00
Garret Wassermann
e6fddd154e
Merge pull request #989 from jrenaut/patch-1
Fix Javascript typo in tickets.html
2022-01-26 19:07:15 -05:00
Jon Renaut
7ac8d20cbe
Fix Javascript typo
This fix enables uploading new attachments to an existing ticket
2022-01-26 14:26:52 -05:00
Garret Wassermann
3695cfa19d
Remove comma in staff.py to address #988 2022-01-04 11:47:31 -05:00
Garret Wassermann
09494e961e
Merge pull request #987 from wheelert/email-attachment-settings
updated validate_file_extension() to look for defined VALID_EXTENSIONS
2021-12-31 22:22:45 -05:00
Garret Wassermann
ae73fec2a0
Spellchecking in validators.py 2021-12-31 22:21:28 -05:00
Thomas Wheeler
345a713777 updated validate_file_extension() to look for defined VALID_EXTENTIONS in settings.py so its configurable 2021-12-31 14:59:37 -08:00
Garret Wassermann
916ffe750c Update azure pipelines for new branch names 2021-11-21 23:52:46 -05:00
Garret Wassermann
dee21a7727 Merge in 0.3.2 bugfix release 2021-11-21 23:40:20 -05:00
Garret Wassermann
94902ec44f Bump version to 0.3.2 for bugfix 2021-11-21 23:37:25 -05:00
Garret Wassermann
e7de309159 Update CONTRIBUTING for the new branch naming scheme 2021-11-21 23:36:17 -05:00
Garret Wassermann
0d79b6266d Backport patch for #985 2021-11-21 23:25:54 -05:00
Garret Wassermann
f73651f8f9
Merge pull request #985 from noobpk/noobpk-fix-xss-markdown
Add URL schemes that are allowed within links
2021-11-21 23:16:16 -05:00
noobpk
a22eb0673f Update pattern 2021-11-19 23:11:33 +07:00
noobpk
7097c9c4c0 Update pattern and code check 2021-11-19 18:54:34 +07:00
noobpk
4a2ca815fd update pattern fix issue multi-line in text can be bypass 2021-11-19 15:24:40 +07:00
noobpk
c54b89f143 Add URL schemes that are allowed within links
Fix bug Stored XSS via markdown
Disclosure: https://huntr.dev/bounties/be7f211d-4bfd-44fd-91e8-682329906fbd/
2021-11-19 13:00:03 +07:00
Garret Wassermann
ffcc83f91d Sync master with 0.3 2021-11-19 00:37:23 -05:00
Garret Wassermann
96338bd73f Bump version to 0.3.1 2021-11-19 00:34:21 -05:00
Garret Wassermann
44abb19712 Backport #980, #981, #984 to 0.3 2021-11-19 00:30:20 -05:00
Garret Wassermann
b78f89c3ef
Merge pull request #984 from noobpk/noobpk-patch-validators
Add `att.full_clean()` before saving to address file validators not working on email attachments
2021-11-18 02:55:39 -05:00
lethanhphuc
04483bdac3
Add att.full_clean() before saving
Fix issue https://github.com/django-helpdesk/django-helpdesk/issues/983
Also, fix bug stored XSS disclosure: https://huntr.dev/bounties/4d7a5fdd-b2de-467a-ade0-3f2fb386638e/
2021-11-18 10:42:02 +07:00
Garret Wassermann
73787bd245
Merge pull request #981 from GibbsConsulting/master
Update task registration in line with Celery changes
2021-11-17 12:14:56 -05:00
Gibbs Consulting
fedcca42ad
Update tasks.py
Following https://docs.celeryproject.org/en/stable/internals/deprecation.html the importing of the celery task decorator needs to be updated for use with the current version of the celery package.
2021-11-12 11:56:22 -08:00
Garret Wassermann
91b37f6d73
Merge pull request #980 from noobpk/noobpk-fix-xss
Add function `htmlEntities` into template ticket_list.html
2021-11-12 12:02:19 -05:00
lethanhphuc
2c7065e0c4
Add function htmlEntities
`htmlentities()` is a function which converts special characters. This allows you to show to display the string without the browser reading it as HTML.
2021-11-11 17:32:09 +07:00
Garret Wassermann
e016e6699d fix minutes representation in models.py, see #978 2021-10-20 08:11:08 -04:00
Garret Wassermann
3f245871ac
Merge pull request #978 from AmatorAVG/master
Fix minutes representation in format_time_spent in models.py
2021-10-20 08:09:02 -04:00
AmatorAVG
5538985fe1
Update models.py
fix minutes representation in format_time_spent
2021-10-20 14:18:38 +07:00