Alex Barcelo
d760d9ee95
adding basic information to tickets, and masking email, on the admin views
2015-12-16 22:27:06 +01:00
Alex Barcelo
fb66fea86e
change basic features of membership into permissions
2015-12-16 22:27:05 +01:00
Alex Barcelo
230d14b3ca
removing QueueMembership mechanisms from admin.py
2015-12-16 22:27:05 +01:00
Alex Barcelo
c1fd47043a
migration for removing semantics from QueueMembership objects
2015-12-16 22:27:05 +01:00
Alex Barcelo
18c7a2e698
adding required model extra info for permissions
2015-12-16 22:27:05 +01:00
Alex Barcelo
c0939d4b38
adding migration for bugfix 'changed max_length given by string to integer;'
2015-12-16 16:37:22 +01:00
Ross Poulton
11467f6e50
Properly check email context keys in newer Python versions. part of #362
2015-12-16 10:48:27 +11:00
Ross Poulton
6187b0568c
Merge pull request #358 from flinz/django-1.9-fixes
...
Django 1.9 compatibility
2015-12-16 10:24:16 +11:00
Alex Seeholzer
54e541230e
Merge branch 'bug/360_max-length-given-by-string' into django-1.9-fixes
...
* bug/360_max-length-given-by-string:
changed max_length given by string to integer;
2015-12-15 10:21:04 +01:00
Alex Seeholzer
905e52e603
changed max_length given by string to integer;
2015-12-15 10:11:47 +01:00
Alex Seeholzer
2da16c511c
updates to remove Django 1.10 deprecation warnings in Django 1.9:
...
- use of patterns() in urls.py is deprecated
- render() functions accept only dicts - introduced checks to ensure downward compatibility back to Django 1.7
2015-12-10 13:36:24 +01:00
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
Alex Seeholzer
f7f0882f86
Merge branch 'master-upstream' into django-1.9-fixes
...
* master-upstream:
Fix QueueMembership bug revealed by django.test's DiscoverRunner
2015-11-18 10:16:33 +01:00
Alex Seeholzer
e732b511e1
deprecated tags replaced in django 1.9 (ssi and url template tags are removed from the future template tag library)
2015-11-16 16:09:47 +01:00
Alex Seeholzer
307e9446a2
ensure tests for ticket submission run correctly in django 1.9 (URI's no longer include the scheme and domain part of the URLs)
2015-11-16 16:08:52 +01: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
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
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
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
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
Alex Seeholzer
f9682ccf37
renamed test __init__.py imports to new test naming scheme
2015-06-12 15:52:35 +02:00
Alex Seeholzer
da30d2b973
tests renamed for compliance
2015-06-12 15:48:38 +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
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
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
Jonathan Barratt
9c60350193
Fix issue 286: Header cuts off body by replacing {{ STATIC_URL }}x with {% static "x" %} in {public_,}base.html
2015-06-03 14:37:21 +07:00
Jonathan Barratt
f434292cfc
Remove migration 0002_socks_proxy.py which has been squashed into 0001, rename migrations 0003 and 0004 and update their dependencies accordingly
2015-06-03 12:39:02 +07:00
Emmanuel Cohen
b0db7aa666
Fix exeception for templetags (works on django 1.7/py3.4 & django 1.6/py2.7)
2015-04-28 14:50:49 +02:00
Ross Poulton
70c57f9096
Merge
2015-04-28 09:13:54 +10:00
