1165 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ross Poulton	525ffce49b	Merge branch 'atmaniak-master'	2015-04-28 09:14:04 +10:00
Ross Poulton	70c57f9096	Merge	2015-04-28 09:13:54 +10:00
Ross Poulton	ffb6243af0	Merge pull request #320 from tony-zhu/master ... Remove deprecated load url from future	2015-04-17 08:42:52 +10:00
Tony Zhu	ed9581e5de	Remove deprecated load url from future	2015-04-16 11:58:24 -04:00
Ross Poulton	2776b897c8	Merge pull request #319 from tony-zhu/master ... Remove no effect model property to silence django 1.8 system check warning	2015-04-15 11:16:13 +10:00
Tony Zhu	807e0c5ea9	Remove extra space line	2015-04-14 16:29:47 -04:00
Tony Zhu	9600f457d8	Remove no effect model property to silence django 1.8 system check warning	2015-04-14 16:25:20 -04:00
Tony Zhu	11e4f1a7bd	Merge upstream changes	2015-04-14 16:10:13 -04:00
Emmanuel Cohen	eb3beb0dc9	Fix statistics for python 3 (still compatible with python 2)	2015-03-27 16:33:31 +01:00
Emmanuel Cohen	f84da6c443	Preliminary support for python 3 & django 1.7	2015-03-27 16:22:37 +01:00
Ross Poulton	5e0ee1e37c	Add bootstrapform to install docs. Closes #307.	2015-02-23 14:24:53 +11:00
Ross Poulton	ae146c2e7f	Remove reference to django.contrib.markup in install docs. (#255)	2015-02-23 14:22:28 +11:00
Ross Poulton	e9555ff72e	Release 0.1.16	2015-02-19 09:54:36 +11:00
Ross Poulton	bb2c240ef8	Use proper URL names for hold/unhold rather than manually building URL. Fixes #299	2015-02-14 11:13:19 +11:00
Ross Poulton	afe6335995	Add install instructions for email templates. Fixes #294.	2015-02-14 11:10:20 +11:00
Ross Poulton	19ec7bee96	Extend attachment filefield max length in upload form. Fixes #301.	2015-02-14 11:02:58 +11:00
Ross Poulton	ba59f38a03	Merge pull request #298 from flinz/master ... Bugfixes for Django 1.6 backwards compatibility.	2015-02-12 11:59:11 +11:00
Alex Seeholzer	124d42e8b0	Merge remote-tracking branch 'upstream/master'	2015-02-11 13:28:03 +01:00
Alex Seeholzer	4ba29c500c	Merge branch 'bugfix_models' ... * bugfix_models: bug fix for commit	2015-02-11 13:25:52 +01:00
Alex Seeholzer	ddabc9d133	bug fix for commit	2015-02-11 13:23:42 +01:00
Alex Seeholzer	4c89456bc1	Merge branch 'populate_usersettings' ... * populate_usersettings: Added south migration to populate the initially existing users with usersettings.	2015-02-11 13:14:55 +01:00
Alex Seeholzer	a11227c6c1	Added south migration to populate the initially existing users with usersettings.	2015-02-11 13:14:36 +01:00
Alex Seeholzer	9665361bb1	In Django < 1.7, if settings.AUTH_USER_MODEL is defined, the sender is expected to be the actual instance, not a string. This Closes rossp/django-helpdesk#295 by checking for django version < 1.7.	2015-02-11 12:23:59 +01:00
Ross Poulton	0ee6fe0802	Merge pull request #292 from flinz/master ... Added missing south migration, adding the missing fields 'helpdesk_queue...	2015-02-11 10:11:59 +11:00
Alex Seeholzer	a87e1355ee	Added missing south migration, adding the missing fields 'helpdesk_queue.socks_proxytype'. This fixes rossp/django-helpdesk#291.	2015-02-10 17:30:32 +01:00
Ross Poulton	fffb2d5eaf	Bump version	2015-01-15 09:04:42 +11:00
Ross Poulton	0732e1f2d3	Merge pull request #287 from djcoin/master ... Populate user settings w/ data migration, Django1.7 compatible fix #276	2015-01-15 09:00:33 +11:00
Simon Thépot	83affccec5	Specify features to load in failing testcase for django < 1.7	2015-01-14 16:00:35 +01:00
Simon Thépot	ed9dbbe42c	Blindly test if failure for django < 1.7 comes from middlewares	2015-01-14 15:54:39 +01:00
Simon Thépot	b53d3ad9bc	Rename initial_data.json to emailtemplate.json	2015-01-14 15:49:08 +01:00
Simon Thépot	f68c1b3ae9	Django1.7 tests: load initial_data w/ migration	2015-01-14 15:36:37 +01:00
Simon Thépot	afb0bd25b3	Test fix: adding a django.setup() phase	2015-01-14 14:10:09 +01:00
Simon Thépot	f0156cfcb3	Populate user settings w/ data migration, Django1.7 compatible, fix #276	2015-01-14 11:19:17 +01:00
Ross Poulton	7b07f56972	Merge pull request #284 from massanchik/master ... Socks proxy support	2014-12-26 11:48:51 +11:00
TreeNode	ae681dd5d3	Clear host and port if no proxy type was set	2014-12-11 12:03:36 +02:00
TreeNode	54dd376b9c	Check for sock lib has installed	2014-12-11 01:44:47 +02:00
TreeNode	aea8ff35a6	PySocks removed from requirements and doc update	2014-12-11 01:43:54 +02:00
TreeNode	135e2d65ea	Created new migrations	2014-12-11 01:42:55 +02:00
TreeNode	83a5e964f3	Default field values	2014-12-11 01:42:20 +02:00
Ashot Seropian	97e0f75723	PySocks for socks proxy support	2014-12-10 23:42:59 +02:00
TreeNode	50b80b2a08	Socks proxy support	2014-12-10 23:37:34 +02:00
Ross Poulton	150fd1b5bc	Fix dist by adding requirements.txt	2014-12-10 09:19:07 +11:00
Ross Poulton	d6cee6cfe4	Bump version for pypi release	2014-12-08 09:07:54 +11:00
Ross Poulton	68cc1b1e8e	Fix esclation description ... Escalation is based on days a ticket has been active, not hours. Fixed config, closes #280. Thanks @J-A-M	2014-11-21 13:00:37 +11:00
Ross Poulton	aa46cc6988	Merge pull request #274 from jennyq/master ... exclude '\r' from subject_part	2014-10-30 10:40:11 +11:00
Jenny Qian	859935e5ee	exclude '\r' from subject_part ... This is to prevent BadHeaderError("Header values can't contain newlines..	2014-10-29 10:57:31 -05:00
Ross Poulton	0d9446480e	Merge pull request #273 from vladyslav2/master ... Fix replace function for custom fields	2014-10-27 11:17:53 +11:00
Ross Poulton	5036639879	Merge pull request #272 from Tyris/master ... Improved custom user model support	2014-10-27 11:17:33 +11:00
Vladyslav T	f1147f695a	Fix replace function for custom fields	2014-10-25 22:53:56 +03:00
Tom Graham	33728bc0b1	Revert "Make sure custom user logic works with Django 1.4" ... This reverts commit 1aed6c9a96.	2014-10-24 18:05:44 +11:00