Garret Wassermann
8473f2de8a
Merge pull request #595 from vzagorovskiy/patch-1
...
Attribute color is not allowed here
2018-02-24 19:04:52 -05:00
vzagorovskiy
40af08ee84
Attribute color is not allowed here
2018-02-24 10:33:14 +03:00
Garret Wassermann
8f930dd14c
Merge pull request #594 from rmad17/master
...
Adding missing migrations
2018-02-21 00:08:44 -05:00
Sourav Basu
2f0f30faa6
Renaming migration
2018-02-20 16:34:33 +05:30
Sourav Basu
c1ead6dc75
Adding missing migrations
2018-02-20 16:29:08 +05:30
Garret Wassermann
95ee61fe90
Fix PEP8 errors
2018-02-16 05:04:10 -05:00
Garret Wassermann
113880bc3a
Compare user IDs to determine if same user, and add simple test case, to fix #588
2018-02-16 05:00:22 -05:00
Garret Wassermann
342622451c
Merge remote-tracking branch 'upstream/master'
2018-02-13 22:26:23 -05:00
Garret Wassermann
55b55edb90
Fix bug in get_email where HTML tags sometimes included in text, reported in #565
2018-02-13 22:25:50 -05:00
Garret Wassermann
0dff0fce06
Merge pull request #593 from ssboy/patch-1
...
Document review ... syncdb obsolete
2018-02-10 19:46:58 -05:00
ssboy
56d287cecd
line 74 ... - run syncdb + run migrate
...
i think syncdb is obsolete from 1.9 ... or not?
2018-02-10 09:43:26 +01:00
Garret Wassermann
45115ba5c7
Actually fix #582 according to quickcheck unittests
2018-02-07 03:01:27 -05:00
Garret Wassermann
73698e8873
More testing
2018-02-07 02:53:40 -05:00
Garret Wassermann
e0096d4821
Update gitignore for eggs/ and travis for latest django LTS release
2018-02-07 02:48:53 -05:00
Garret Wassermann
31887504fd
seperate out text for better logging of error
2018-02-07 02:46:13 -05:00
Garret Wassermann
0bddf819f7
merge upstream
2018-02-07 02:16:41 -05:00
Garret Wassermann
a10c662207
Patch for #582 , POP3 processing error on py3
2018-02-07 02:14:28 -05:00
Garret Wassermann
2852e7ba28
Merge pull request #586 from aesdev/master
...
Fix for Email Issue while pulling CC and ValueError for public homepage
2018-01-12 13:55:01 -05:00
Dilip Dwarak
cf85c3d9ab
Fixe for Email Issue while pulling CC and ValueError for public homepage
2018-01-11 14:49:21 -05:00
Garret Wassermann
75f54dd233
Testing quicktest.py
2018-01-11 02:19:49 -05:00
Garret Wassermann
a957e74853
Merge pull request #583 from arnuschky/feature-public-ticket-defaults
...
Adds pre-defined values for public tickets
2018-01-10 13:22:39 -05:00
Garret Wassermann
ed0596e430
Merge branch 'master' into feature-public-ticket-defaults
2018-01-10 13:18:29 -05:00
Arne Brutschy
1b7214a797
Added documentation for public form defaults
2018-01-10 18:44:15 +01:00
Arne Brutschy
f3e52a2f12
Adds pre-defined values for public tickets
...
This commit adds three new settings that allow the operator to
pre-define the `queue`, `priority` and `due_date` fields for public
tickets. If one of these settings are present the corresponding input
field is hidden from the form.
The settings are the following:
HELPDESK_PUBLIC_TICKET_QUEUE = 'website'
HELPDESK_PUBLIC_TICKET_PRIORITY = 2
HELPDESK_PUBLIC_TICKET_DUE_DATE = ''
If the due date is set to the empty string, no due date is saved in the
ticket (analogously to the form). The other settings should be
self-explanatory.
2018-01-09 14:53:05 +01:00
Garret Wassermann
bad1ece1c5
Remove offending CSS comment again to address #479
2017-12-29 01:03:16 -05:00
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
