640 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Tom Graham	1aed6c9a96	Make sure custom user logic works with Django 1.4 ... Monkey Patch for Django 1.4 to allow new custom user model logic.	2014-10-24 17:56:52 +11:00
Tom Graham	eef2a66f23	Fix for no model_name in django < 1.6	2014-10-22 17:35:24 +11:00
Tom Graham	15feb7def3	Typo in previous commit	2014-10-22 17:32:17 +11:00
Tom Graham	d966172fb7	Fix user changelist for custom user models ... Fixed the user_admin_changelist url for custom user models.	2014-10-22 17:23:56 +11:00
Tom Graham	d2ac8af6c0	Improved support for custom user models ... Support for custom user models with a non-standard username field	2014-10-22 16:18:04 +11:00
Ross Poulton	b0756497dc	Merge pull request #262 from AGASS007/master ... fixed tooltip (again)	2014-09-24 08:17:20 +10:00
Ross Poulton	3093416d33	Merge pull request #261 from tonioo/master ... Do not use the builtin staff_member_required decorator.	2014-09-24 08:16:36 +10:00
Guillaume Andreu Sabater	d5dd2c3423	actually enable tooltip	2014-09-22 14:04:14 +02:00
Guillaume Andreu Sabater	45eda26e7c	swapped <a> and <strong> tags	2014-09-22 14:03:37 +02:00
Guillaume Andreu Sabater	05350ba37c	fixed typo	2014-09-22 14:00:33 +02:00
Antoine Nguyen	58c2c818f4	Use the right values to identify priorities.	2014-09-22 10:01:08 +02:00
Antoine Nguyen	8095d30e8e	Remove unknown reference to priority.	2014-09-19 16:06:11 +02:00
Antoine Nguyen	ad47087c8f	Assign a bootstrap row color to tickets based on priority.	2014-09-19 16:01:15 +02:00
Antoine Nguyen	91628ab788	Do not use the builtin staff_member_required decorator. ... Before 1.7, this decorator always redirects to the admin login page so the LOGIN_URL setting is useless.	2014-09-19 15:15:42 +02:00
Ross Poulton	5e30c86561	Merge pull request #260 from AGASS007/master ... Enable bs3 tooltips with html markup	2014-09-19 09:27:00 +10:00
Guillaume Andreu Sabater	85b90d0030	Enable bs3 tooltips with html markup	2014-09-18 14:42:06 +02:00
Ross Poulton	863effdcb6	Update French translations. Thanks to @tonioo; closes #259.	2014-09-18 09:50:18 +10:00
Ross Poulton	090f9d4c40	Merge branch 'master' of github.com:rossp/django-helpdesk	2014-09-16 20:48:45 +10:00
Ross Poulton	7fe1cb4c9f	Update & recompile translations	2014-09-16 19:54:05 +10:00
Ross Poulton	8a66afa9b8	Merge pull request #256 from erikr/link-build-buttons ... Made build status buttons link to Travis.	2014-09-15 09:17:56 +10:00
Erik Romijn	8f4760a523	Made build status buttons link to Travis.	2014-09-14 13:14:18 +02:00