holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity
722 Commits 1 Branch 37 Tags 26 MiB
8d55dcb9a0
Commit Graph

722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Seeholzer
8d55dcb9a0 python 2 & 3 compatibility: changed __unicode__ to __str__ and added python2 decorators (https://docs.djangoproject.com/en/1.8/topics/python3/#str-and-unicode-methods) 2015-11-18 15:26:08 +01:00
Alex Seeholzer
8390125c01 fixes of python 3 test fails 2015-11-18 15:07:33 +01:00
Alex Seeholzer
71504aa85d minor changes for python3 2015-11-18 10:41:02 +01:00
Ross Poulton
aae2501cab Merge pull request #354 from reduxionist/bug/per-queue-membership-but-no-memberships 
Fix QueueMembership bug revealed by django.test's DiscoverRunner
 2015-11-17 12:00:19 +11:00
Jonathan Barratt
0610a6645d Fix QueueMembership bug revealed by django.test's DiscoverRunner 
If HELPDESK_ENABLE_PER_QUEUE_STAFF_MEMBERSHIP was True but a user had
no QueueMembership entries, then restricting queue access generated
RelatedObjectDoesNotExist exceptions.

 - Ask for forgiveness whenever we try to limit a queryset by the
queuemembership related object set.

 - Since tests can now be run with the project's settings active,
rather than only with quicktest.py's settings, restore the initial
HELPDESK_ENABLE_PER_QUEUE_MEMBERSHIP value after having tested the
related functionality.
 2015-11-16 18:45:27 +07:00
Ross Poulton
ddd5b21b45 Merge pull request #352 from ssadler/static_from_staticfiles 
use staticfiles app instead of STATIC_URL
 2015-11-15 12:25:42 +11:00
Ross Poulton
0d995e0235 Merge pull request #351 from flinz/django-1.8 
Django 1.8 compatibility including updated testrunners
 2015-11-15 12:25:08 +11:00
Scott Sadler
2663a5e5ba use staticfiles app instead of STATIC_URL 2015-11-13 16:58:28 +01:00
Alex Seeholzer
0399612e57 bugfix: migration dependency corrected 2015-11-13 16:03:13 +01:00
Tony Zhu
dbdaca8dd4 django 1.8 email field size migration 2015-11-13 15:50:22 +01:00
Tony Zhu
0b0f946389 Add the migration for changes in queues 
This is the missing migration for commit
9600f457d8
 2015-11-13 15:50:22 +01:00
Alex Seeholzer
27c519f2ee downwards compatibility for django < 1.8 2015-11-13 15:36:04 +01:00
Alex Seeholzer
cd0daccb56 tests are correctly discovered for django < 1.6 2015-11-13 15:35:36 +01:00
Alex Seeholzer
50877c3708 Trying to fix travis build error & more general test imports: all files with test_*.py are imported from the /tests directory; 2015-11-13 14:07:36 +01:00
Alex Seeholzer
8f585aef1c Merge commit 'a4e6f086c8928e77baa73a25b7e8000fb6261498' into django-1.8 
* commit 'a4e6f086c8928e77baa73a25b7e8000fb6261498':
  Include attachments to cc'd users on ticket update
  From gettatr to get, because dict doesn't contatin attributes. More readable if statement.
 2015-11-13 13:50:11 +01:00
Ross Poulton
a4e6f086c8 Merge pull request #350 from ssadler/updated_cc_attachments 
Include attachments to cc'd users on ticket update
 2015-11-13 08:20:26 +11:00
Ross Poulton
de060bd3be Merge pull request #349 from ErhoSen/email_on_change_api 
From gettatr to get, because dict doesn't contatin attributes.
 2015-11-13 08:20:19 +11:00
Scott Sadler
98ad8567b9 Include attachments to cc'd users on ticket update 2015-11-12 15:53:16 +01:00
vlad.vyazovetskov
0a3171a024 From gettatr to get, because dict doesn't contatin attributes. 
More readable if statement.
 2015-11-12 17:31:14 +03:00
Alex Seeholzer
25aac19692 Merge pull request #2 from ssadler/django-1.8 
Merge rossp master and fix test bug
 2015-11-06 16:35:54 +01:00
Scott Sadler
2681f6340c fix reload_urlconf test helper so it supports a third party urlconf 2015-11-06 15:22:44 +01:00
Scott Sadler
e82c17567a Merge branch 'master' into django-1.8 
Conflicts:
	helpdesk/tests/__init__.py
 2015-11-06 14:50:33 +01:00
Ross Poulton
387cc413a0 Merge pull request #340 from fjcapdevila/master 
Fix typo in docs.
 2015-09-15 09:27:15 +10:00
Francisco Capdevila
29be47bd65 Merge pull request #1 from fjcapdevila/fix_typo_in_docs 
Fix typo
 2015-09-14 09:51:40 -03:00
Francisco Capdevila
3bc7ed64ee Fix typo 2015-09-14 09:47:40 -03:00
Alex Seeholzer
163a0524b1 Merge branch 'master' into django-1.8 
* master:
  renamed test __init__.py imports to new test naming scheme
 2015-06-25 16:54:15 +02:00
Ross Poulton
48d1feb69d Merge pull request #334 from pahpa/master 
Modify make_option with dest variable 'escalate-verbosely'
 2015-06-19 09:25:40 +10:00
pahpa@orange.fr
060266e93a Modify make_option with dest variable 'escalate-verbosely' 2015-06-17 16:22:44 +02:00
Ross Poulton
84330eeebb Merge pull request #332 from reduxionist/per-queue-staff-membership 
Per queue staff membership
 2015-06-15 19:18:15 +10:00
Alex Seeholzer
f9682ccf37 renamed test __init__.py imports to new test naming scheme 2015-06-12 15:52:35 +02:00
Alex Seeholzer
4f8fb983a8 Merge branch 'master' into django-1.8 2015-06-12 15:51:45 +02:00
Alex Seeholzer
da30d2b973 tests renamed for compliance 2015-06-12 15:48:38 +02:00
Alex Seeholzer
0311331181 Merge branch 'master' into django-1.8 
* master:
  removed unneccessary lines from quicktest.py and added source
 2015-06-12 15:38:08 +02:00
Alex Seeholzer
55dd80fa06 removed unneccessary lines from quicktest.py and added source 2015-06-12 15:35:58 +02:00
Alex Seeholzer
ca9d7bc5c4 Merge branch 'master' into django-1.8 2015-06-12 15:31:12 +02:00
Alex Seeholzer
05625d0bfd added test running compatibility for django 1.8, workin in 1.6 and 1.7 2015-06-12 15:30:54 +02:00
Alex Seeholzer
87225ce2ba tests renamed for compliance 2015-06-12 15:27:49 +02:00
Alex Seeholzer
cbea3c54f0 conformed template from_string method to use engines['django'] 2015-06-12 12:54:50 +02:00
Alex Seeholzer
0b7e0b7f04 changes in templating engine that worked for django 1.8 2015-06-12 12:52:35 +02:00
Alex Seeholzer
039653cc70 further fixes for Django 1.8.2 template engine 2015-06-12 12:52:34 +02:00
Alex Seeholzer
0f69771164 fix for django 1.8.2, get_template_from_string was removed 2015-06-12 12:52:34 +02:00
Alex Seeholzer
42f478b98c Merge squashed fixes from flinz/per-queue-staff-membership: 
-renamed migration 0005 to 0004 and referenced 0003 instead of 0004 from it.
-Corrected spelling and rephrased docs for queue membership feature.
 2015-06-12 17:41:15 +07:00
Alex Seeholzer
f5401b6887 Merge remote-tracking branch 'upstream/master' 2015-06-12 10:42:02 +02:00
Jonathan Barratt
bfcd8fc024 Add ability to restrict users' access by queue if so configured, and migration and tests for same. 2015-06-12 12:23:39 +07:00
Ross Poulton
9807356e84 Merge pull request #331 from reduxionist/fix-reports_CHOICES_display 
As of at least Django 1.5, calling __str__() on a CHOICES object…
 2015-06-11 20:23:27 +10:00
Jonathan Barratt
711eb6cea2 As of at least Django 1.5, calling __str__() on a CHOICES object returns a proxy object, not the actual text of the CHOICE. Change such calls to title() instead 2015-06-11 14:31:49 +07:00
Ross Poulton
6595eebd3f Merge pull request #328 from reduxionist/fix-squashed-socks_proxy-migration 
Remove migration 0002_socks_proxy.py...
 2015-06-10 09:35:10 +10:00
Ross Poulton
140c241cfe Merge pull request #329 from reduxionist/patch-1 
Update install.rst
 2015-06-10 09:34:14 +10:00
Ross Poulton
3d8acca6db Merge pull request #330 from reduxionist/issue_286-header_cuts_off_body 
Fix issue 286: Header cuts off body…
 2015-06-10 09:33:36 +10:00
Jonathan Barratt
fd6988aad7 Add STATIC_URL setting to quicktest.py so that tests pass for Django versions 1.5 through 1.7 2015-06-03 15:42:35 +07:00