1997 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Garret Wassermann	db6202aac0	Merge pull request #946 from alligatorbait/custom_datetime ... CustomField datetime type formats updated to fixed string formats	2021-02-10 20:14:46 -05: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
Garret Wassermann	7559e2aa74	Merge pull request #944 from alligatorbait/merged_to ... Fix a bug in EditTicketForm preventing edits	2021-02-09 15:14:20 -05:00
Tom Weber	ae9109bad6	Bug Fix EditTicketForm unable to edit and add error display	2021-02-09 13:08:27 -07:00
Tom Weber	e52471b49b	Merge pull request #10 from django-helpdesk/master ... update	2021-02-09 12:56:17 -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	8a27d9bbc2	Merge pull request #9 from alligatorbait/include_js ... base_js.html moved to load before code using the resource.	2021-02-02 17:51:49 -07:00
Garret Wassermann	279d8c12e7	Merge pull request #935 from alligatorbait/include_js ... Include base_js.html moved to head of base.html	2021-02-02 19:41:18 -05: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
Tom Weber	3975046590	Merge pull request #8 from django-helpdesk/master ... Update to current	2021-02-01 10:46:26 -07:00
Edgard Pineda	76f697cad3	Fix import of celery decorator "task".	2021-01-31 22:27:37 -03:00
Garret Wassermann	aeb3bf0762	Merge pull request #927 from Benbb96/fix-926 ... Fix #926, TicketCustomFieldValue Boolean (if not required) does not set in EditTicketForm	2021-01-16 18:00:48 -05:00
Benbb96	f9d000b953	Fix #926	2021-01-16 23:28:30 +01:00
Garret Wassermann	56c3c66a35	Merge pull request #925 from HugoDelval/patch-1 ... email templates: small typos in french	2021-01-14 12:13:08 -05:00
Hugo DELVAL	bc1c5f6f17	email templates: small typos in french	2021-01-14 18:06:33 +01:00
Garret Wassermann	90c0e11e9f	Merge pull request #924 from bikeshedder/master ... Update German translation	2021-01-12 10:11:58 -05:00
Michael P. Jung	31a8a9dab4	Update German translation	2021-01-12 13:40:49 +01:00
Garret Wassermann	0acffeff94	Bump to 0.3.0 beta 3	2021-01-04 17:52:01 -05: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
Garret Wassermann	6e1a1a7c87	Merge pull request #920 from Benbb96/fix-login-errors ... Fix some login errors when using demodesk	2021-01-04 15:51:20 -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	63790c5b1d	Update CONTRIBUTING.rst ... Update broken link to Transifex project in CONTRIBUTING.rst	2020-12-22 12:44:29 -05: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
Garret Wassermann	87c949859f	Merge pull request #915 from evili/master ... Add support for standard STARTTLS on port 143 (RFC 2595).	2020-12-04 11:01:39 -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
Garret Wassermann	b9855ec83f	Merge pull request #909 from koriaf/dev-no-socks-tests ... fix(tests): Run tests without the socks components and document their usage	2020-11-24 17:32:52 -05:00
Arkadiy Korotaev	4955d983a2	fix(tests): Run tests without the socks components and document their usage	2020-11-24 11:21:51 +01:00
Garret Wassermann	dcdfb1b405	Merge pull request #907 from alligatorbait/master ... Timeline 3 license added	2020-11-16 11:48:22 -05:00
Tom Weber	07bead0f8f	timeline 3 license	2020-11-16 07:13:56 -07:00
Garret Wassermann	609a31acce	Merge pull request #906 from alligatorbait/master ... timeline3 can now be used offline or with CDN	2020-11-14 22:13:51 -05:00
Tom Weber	040a0e8d9d	Enable offline content for timeline3 usage	2020-11-14 12:54:10 -07:00
Tom Weber	112b491f78	Merge pull request #7 from django-helpdesk/master ... Merge pull request #904 from alligatorbait/master	2020-11-14 11:17:54 -07:00
Tom Weber	f1a4b87dbd	Enable offline content for timeline usage	2020-11-14 11:13:26 -07:00
Garret Wassermann	cad87b90b2	Merge pull request #904 from alligatorbait/master ... Allow users to edit tickets if HELPDESK_ALLOW_NON_STAFF_TICKET_UPDATE enabled	2020-11-12 23:56:34 -05:00