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

457 Commits

Author SHA1 Message Date
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
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
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
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
7fe1cb4c9f Update & recompile translations 2014-09-16 19:54:05 +10:00
Ross Poulton
1a157ed097 Django 1.7 compat update. Fixes #255, thanks @danie1k 2014-09-11 17:37:51 +10:00
Ross Poulton
61f49786c0 Fixes for Django 1.7. For prior Django versions, South 1.0 must be used for 
migirations. Fixes #254.
 2014-09-10 09:06:50 +10:00
Ross Poulton
4c901880bc Allow file attachments in storages other than local files (eg S3). Fixes GH-249. 2014-09-02 18:36:00 +10:00
Ross Poulton
1aed98463a Increase size of attachment filename. Fixes #164. 2014-09-02 18:36:00 +10:00
Stefano Brentegani
5346c17629 Merge branch 'master' of https://github.com/rossp/django-helpdesk into refactor-staff-filter 2014-07-31 06:22:59 +02:00
Stefano Brentegani
299c23671a update .po files (preserve already translated text) 2014-07-30 11:13:42 +02:00
Stefano Brentegani
94fa283f2d mark new translatable strings and reduce redundancy 2014-07-30 10:41:10 +02:00
Stefano Brentegani
5e1616d83a split blocktrans in templates 2014-07-30 10:40:13 +02:00
Stefano Brentegani
9bbcaa5cc0 download and recompile translations from Transifex (adds Arabic) 2014-07-30 09:53:24 +02:00
Stefano Brentegani
fdd2508e22 missing load url in template 2014-07-27 18:32:56 +02:00
Stefano Brentegani
0c93de8bdb Merge branch 'master' into template-cleanup 
Conflicts:
	helpdesk/templates/helpdesk/navigation.html
 2014-07-26 14:03:08 +02:00
Ross Poulton
d38240e3cb Merge pull request #237 from brente/user-menu 
User menu
 2014-07-26 20:30:44 +10:00
Ross Poulton
201a7e91cd Merge pull request #236 from brente/fix-typo 
fix typo in template condition
 2014-07-26 20:30:17 +10:00
Stefano Brentegani
5e9fd86941 Bootstrap version of the user settings form 2014-07-25 20:57:34 +02:00
Stefano Brentegani
9433f34f9b Nav: use full user name, if available, fix icon 2014-07-25 20:14:13 +02:00
Stefano Brentegani
b05c396918 User menu = User settings, Change password, Logout 2014-07-25 18:08:47 +02:00
Stefano Brentegani
47bec43108 fix typo in template condition 2014-07-25 17:23:54 +02:00
Stefano Brentegani
597fd2b4af update jqPlot (resolves compatibility issues with jQuery 1.9+) 2014-07-25 14:47:37 +02:00
Stefano Brentegani
311dfa6dbd missing spaces in navigation menu 2014-07-25 14:08:35 +02:00
Ross Poulton
b1b1f93e1e speed up dashboard queries by using select_related (fixes #233) 2014-07-23 09:37:21 +10:00
Stefano Brentegani
6d86b62673 missing template lib references 2014-07-22 19:27:37 +02:00
Stefano Brentegani
78103c345b separate dashboard elements for easier customisation 2014-07-22 19:20:40 +02:00
Stefano Brentegani
cfd0ca3b7d remove row_columnheads class from table headers 2014-07-22 16:09:06 +02:00
Stefano Brentegani
df32432685 Merge commit 'fd0ab29dfcfc263be686c8351f4dc5880e3e1b9b' into template-cleanup 
Conflicts:
	helpdesk/templates/helpdesk/dashboard.html
	helpdesk/templates/helpdesk/kb_category.html
	helpdesk/templates/helpdesk/ticket_desc_table.html
 2014-07-22 07:28:04 +02:00
Ross Poulton
1524cb4ca1 Merge pull request #232 from brente/ago-naturaltime 
Use naturaltime for elapsed times
 2014-07-22 14:59:20 +10:00
Stefano Brentegani
d95aa46b03 Merge branch 'master' into template-cleanup 2014-07-22 06:43:05 +02:00