1209 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Garret Wassermann	31b49ab2f6	Merge branch 'master' into develop	2017-12-28 09:32:14 -05:00
Garret Wassermann	aa63e8f299	Really fix py 2 imp/importlib	2017-12-28 09:26:14 -05:00
Garret Wassermann	4b78704180	Fix error on python 2	2017-12-28 09:22:57 -05:00
Garret Wassermann	3ccd6c8dc8	Merge 0.2.6 Django 2.0 updates	2017-12-28 09:16:01 -05:00
Garret Wassermann	d18ce1f1d5	Bump version to 0.2.6 to fix remaining Django 2.0 warnings	2017-12-28 09:11:34 -05:00
Garret Wassermann	523329eab5	Merge 0.2.5 bugfixes and Django 2.0 changes	2017-12-28 07:43:10 -05:00
Garret Wassermann	5112f0dfd0	Address deprecation warnings to be compatible with Django 2.0	2017-12-28 07:23:51 -05:00
Garret Wassermann	f91762d4cd	Bump version to 0.2.5, add STATIC_ROOT to demo config to test collectstatic	2017-12-28 06:32:42 -05:00
Garret Wassermann	0d2df19835	Fix collectstatic errors, as reported in #479	2017-12-28 06:04:05 -05:00
Garret Wassermann	142c291afb	Merge 0.2.4 bugfixes	2017-12-18 00:45:36 -05:00
Garret Wassermann	e83b64c973	Bump to version 0.2.4	2017-12-18 00:32:33 -05:00
Garret Wassermann	4c184a6aa8	Ignore helpdesk/attachments folder autogenerated by demo, make distclean will remove it too	2017-12-18 00:31:53 -05:00
Garret Wassermann	73ba28cb6c	Update demo settings to link to django 1.11 documentation since we require that version	2017-12-18 00:28:03 -05:00
Garret Wassermann	e19666b729	Add a check that the email subject template includes the ticket ID to prevent problems, to address issue raised in #577	2017-12-17 23:47:48 -05:00
Garret Wassermann	5502333a4c	Add warning about changing the email subject template, to address issue brought up in #577	2017-12-17 23:41:53 -05:00
Garret Wassermann	8972baddda	Remove dead jqplot code from report output, and remove unused jqplot plugin from static/ directory	2017-12-17 23:23:03 -05:00
Garret Wassermann	fca81ac38c	Remove duplicate jquery files, update public_base to point to jquery included in vendor/ directory	2017-12-17 23:16:14 -05:00
Garret Wassermann	2d8d8dcf0c	Remove offending comment in jquery-ui.min.css, as previously reported in #479	2017-12-17 23:09:12 -05:00
Garret Wassermann	230b9d7ed0	Fix broken try-except statement in lib, for #577	2017-12-15 20:35:41 -05:00
Garret Wassermann	03599f462b	Catch exception when someone enters a non-integer text into the public ticket view form, #576	2017-12-15 20:28:39 -05:00
Garret Wassermann	1d63e25855	Improve permissions to view pages, to partially address #326	2017-12-15 17:18:54 -05:00
Garret Wassermann	f173b6a859	Merge pull request #574 from pjsong/master ... fix typo of new chinese support in emailtemplate	2017-12-11 13:06:38 -05:00
jeson_peng	6ff5799bef	fix typo in new chinese support in emailtemplate, demo is ready at helpdesk.pengel.cn	2017-12-11 15:53:43 +08:00
Garret Wassermann	92b43ef495	Merge master 0.2.3 bugfixes into develop	2017-12-09 23:02:12 -05:00
Garret Wassermann	980e8b6f7d	Update version to 0.2.3 to include zh_Hans translations forgotten from 0.2.2 upload	2017-12-09 22:53:47 -05:00
Garret Wassermann	e635853570	Merge remote-tracking branch 'upstream/master'	2017-12-09 22:50:57 -05:00
Garret Wassermann	686d0f9540	Update demodesk project version to match the django-helpdesk version	2017-12-09 12:12:48 -05:00
Garret Wassermann	17c75b0ace	Merge pull request #573 from pjsong/master ... add translation for chinese, zh_Hans is the new locale support code for django	2017-12-09 11:39:22 -05:00
jeson_peng	2007fcdc30	add translation for chinese, zh_Hans is the new locale support code for django	2017-12-09 18:52:39 +08:00
Garret Wassermann	a6c1469bfb	Update zh_CN translation, see #571, thanks pjsong!	2017-12-08 11:53:27 -05:00
Garret Wassermann	47f92eba1e	More PEP8 fixes for get_email	2017-12-06 02:59:50 -05:00
Garret Wassermann	9340e149d5	Wrap IMAP login attempt in a try except, log error if session timeout and exit script gracefully to prevent crashes, to address #568	2017-12-06 02:55:31 -05:00
Garret Wassermann	a2c10edb35	Fix bytes/str confusion in Py3 after address naked except	2017-12-06 02:28:18 -05:00
Garret Wassermann	c085dba901	Trying to actually fix naked except	2017-12-06 02:21:46 -05:00
Garret Wassermann	0b249e1693	Fix error importing django settings due to naked except	2017-12-06 02:11:45 -05:00
Garret Wassermann	bc0125421b	Fix PEP8 errors detected by new pycodestyle script	2017-12-06 02:06:07 -05:00
Garret Wassermann	2290be4e1b	Use pycodestyle instead of pep8 for testing, to address #570	2017-12-06 01:27:02 -05:00
Garret Wassermann	dffab1bb6a	PEP8 fixes for test_get_email.py	2017-12-05 03:52:38 -05:00
Garret Wassermann	fca6b483f2	Add PGP signed email test case to get_email tests, for #567	2017-12-05 03:47:05 -05:00
Garret Wassermann	32cc5e2496	Patch for handling base64 encoding on Py 2 and 3, to address #567	2017-12-05 02:51:15 -05:00
Garret Wassermann	43035afc07	Update travis to use latest Django	2017-12-05 02:41:45 -05:00
Garret Wassermann	47c1a7b1c3	Merge branch 'upstream/0.2.x', to merge #566	2017-11-03 01:15:21 -04:00
Garret Wassermann	d1a8f90156	Merge pull request #566 from nicoamaro/patch-1 ... Update install.rst	2017-11-02 16:14:47 -04:00
nicoamaro	d7fbcf02d9	Update install.rst	2017-11-02 15:55:51 -03:00
Garret Wassermann	65c1d05eef	Use BeautifulSoup to get text out of HTML-only emails, to address issue in #565	2017-10-31 03:24:04 -04:00
Garret Wassermann	8f375e1379	Address bytes/str issue with POP3 email in get_email script, to address #565	2017-10-31 01:24:26 -04:00
Garret Wassermann	6e2a16e5a6	Fixing unit tests for python3 for custom staff filters	2017-10-30 05:07:44 -04:00
Garret Wassermann	27ee01449e	Add missing imports for custom staff filters	2017-10-30 03:41:49 -04:00
Garret Wassermann	3a1bd76e75	Merge custom staff filter, PR #239	2017-10-30 03:17:40 -04:00
Garret Wassermann	1bd88c0f4f	Turn on template debug for the demo	2017-10-30 00:56:06 -04:00