Commit Graph

1009 Commits

Author SHA1 Message Date
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
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
Ross Poulton
1a157ed097 Django 1.7 compat update. Fixes #255, thanks @danie1k 2014-09-11 17:37:51 +10:00
Ross Poulton
a749726a17 Add simplejson to requirements. 2014-09-10 09:16:26 +10:00
Ross Poulton
bfd76e7f05 Update Django versions we test against; 1.4 now excluded 2014-09-10 09:16:19 +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
fdd715795f Remove unused tickets (part of #200); closes #253 2014-09-10 09:02:14 +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
Ross Poulton
2e3fe0d73d Merge pull request #244 from brente/i18n-next
Split translatable text blocks and mark new resources
2014-08-01 10:48:22 +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
Ross Poulton
9f1f350521 Merge pull request #242 from brente/i18n-synch
i18n update
2014-07-31 09:57:10 +10: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
74cf340ab5 update Transifex config file 2014-07-30 09:52:14 +02:00
Ross Poulton
fbb90cac71 Merge pull request #238 from brente/template-cleanup
Template cleanup
2014-07-28 08:55:31 +10: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
Ross Poulton
4d20f3bce2 Merge pull request #235 from brente/master
Report charts not working: update jqPlot
2014-07-26 20:30:00 +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
50cd513aec Merge branch 'master' into template-cleanup 2014-07-22 07:43:36 +02:00