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 |
|
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
|
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 |
|
Tony Zhu
|
ed9581e5de
|
Remove deprecated load url from future
|
2015-04-16 11:58:24 -04: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 |
|
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
|
19ec7bee96
|
Extend attachment filefield max length in upload form. Fixes #301.
|
2015-02-14 11:02:58 +11: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 |
|
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 |
|
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
|
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
|
f0156cfcb3
|
Populate user settings w/ data migration, Django1.7 compatible, fix #276
|
2015-01-14 11:19:17 +01: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
|
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 |
|
TreeNode
|
50b80b2a08
|
Socks proxy support
|
2014-12-10 23:37:34 +02: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 |
|
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 |
|
Tony Zhu
|
8635742931
|
Rename the initial data to avoid django 1.7 flush bug
|
2014-10-23 10:48:11 -04:00 |
|
Tony Zhu
|
dc86236136
|
Go back to the original helpdesk repo
|
2014-10-23 10:44:59 -04: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 |
|
Tony Zhu
|
af1a297460
|
Merge from origin repo
|
2014-10-20 14:12:40 -04:00 |
|
Ross Poulton
|
b0756497dc
|
Merge pull request #262 from AGASS007/master
fixed tooltip (again)
|
2014-09-24 08:17:20 +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 |
|