Ross Poulton
|
08e489f78d
|
Merge pull request #139 from Lacrymology/master
Conditional tag field has problems with migrations. Fixes #126.
|
2012-05-14 16:08:50 -07:00 |
|
Tomas Neme
|
e7ec916c79
|
Merge branch 'conditional-tags'
|
2012-05-14 13:24:54 -03:00 |
|
Tomas Neme
|
21a21c5097
|
fix conflicts with master
|
2012-05-14 13:24:36 -03:00 |
|
Tomas Neme
|
0372256fcf
|
Merge branch 'master' of github.com:Lacrymology/django-helpdesk
|
2012-05-14 13:21:05 -03:00 |
|
Tomas Neme
|
22036d0a38
|
merge branch master
|
2012-05-14 13:19:22 -03:00 |
|
Tomas Neme
|
f4dc848ae9
|
adding conditional migration
|
2012-05-14 13:15:57 -03:00 |
|
Tomas Neme
|
75e7d209e5
|
fixing frozen model in migration 0005 to add field added in 0004
|
2012-05-14 13:07:36 -03:00 |
|
Ross Poulton
|
f33f683259
|
Merge pull request #137 from brente/master
Fix for ticket list sorting and pagination
|
2012-05-11 23:20:46 -07:00 |
|
Tomas Neme
|
812772eab8
|
adding missing migration
|
2012-05-11 17:07:14 -03:00 |
|
Stefano Brentegani
|
a520e380f0
|
fix ticket list (sorting and status querystring)
|
2012-05-11 17:15:46 +02:00 |
|
Ross Poulton
|
9f0e07f5e6
|
Add Django 1.4 support - remove old feeds import (no longer required) and add Timezone support. Fixes #135.
|
2012-05-11 17:02:55 +10:00 |
|
Ross Poulton
|
1a8fa1e885
|
Merge pull request #136 from brente/i18n
Italian email templates revision
|
2012-05-09 16:59:56 -07:00 |
|
Ross Poulton
|
4e4bbc74c4
|
Merge pull request #133 from brente/master
Ticket update with no due date set fails
|
2012-05-09 16:57:50 -07:00 |
|
Stefano Brentegani
|
8522bdd0d1
|
Italian email templates revision
|
2012-05-09 14:29:18 +02:00 |
|
unknown
|
1363ba3ce1
|
fix ticket update with no due date set
|
2012-05-08 14:36:13 +02:00 |
|
Ross Poulton
|
e8ee39ddaa
|
Merge pull request #132 from ochagnon/master
other html fixes
|
2012-05-01 16:34:14 -07:00 |
|
Ross Poulton
|
13d1277160
|
Merge pull request #131 from ochagnon/patch-1
HTML fixes
|
2012-04-30 15:49:44 -07:00 |
|
Oriane Chagnon
|
2436cbeca2
|
close ul BEFORE closing div
|
2012-04-30 19:31:13 -03:00 |
|
Oriane Chagnon
|
b42e619b7f
|
close ul BEFORE closing div
|
2012-04-30 19:28:19 -03:00 |
|
Oriane Chagnon
|
88d6b61a2e
|
remove closing </label> tag for unopened <label>.
|
2012-04-30 18:34:09 -03:00 |
|
Oriane Chagnon
|
77c6008b9a
|
remove closing </dt> tags for unopened <dt>. and close <dl>
|
2012-04-30 18:08:42 -03:00 |
|
Oriane Chagnon
|
bbdb8f1734
|
Remove closing </label> tag that do not match any opening <label>
|
2012-04-30 17:11:25 -03:00 |
|
Ross Poulton
|
951539db91
|
Re-run makemssages && compilemssages
|
2012-04-25 18:27:04 +10:00 |
|
Ross Poulton
|
e854791ad4
|
Update demo site URL
|
2012-04-25 18:16:50 +10:00 |
|
Ross Poulton
|
4b2cd30e67
|
Increment version number
|
2012-04-25 18:05:37 +10:00 |
|
Ross Poulton
|
a45f4510ed
|
Merge pull request #127 from brente/fix-migrations
fix frozen models in migrations 0004+0005
|
2012-04-25 00:56:52 -07:00 |
|
Ross Poulton
|
89b8267d84
|
Fix RSS feeds for post-Django 1.2. Closes #129.
|
2012-04-25 17:55:38 +10:00 |
|
Stefano Brentegani
|
a19f5d16bb
|
fix frozen models in migrations 0004+0005
|
2012-04-20 00:35:28 +02:00 |
|
Ross Poulton
|
4fb9ab0617
|
Fixes #122 - avoid exception when taking ticket.
|
2012-04-11 17:48:39 +10:00 |
|
Ross Poulton
|
b970f12799
|
Merge pull request #124 from Lacrymology/master
Fixes #123
|
2012-04-10 20:53:25 -07:00 |
|
Tomas Neme
|
e138fa108f
|
Merge branch 'master' into add-migration
|
2012-04-02 16:03:47 -03:00 |
|
Tomas Neme
|
28c007ea23
|
creating missing migration
|
2012-04-02 16:03:15 -03:00 |
|
Ross Poulton
|
321a9aef2d
|
Add setting HELPDESK_SHOW_KB_ON_HOMEPAGE to show KnowledgeBase
categories on the homepage.
Bumped version number.
|
2012-03-02 09:28:54 +11:00 |
|
Ross Poulton
|
4ae7069517
|
Merge pull request #112 from fatbox/master
Ensure followup comments are in the context in the get_email command
|
2012-02-21 02:44:09 -08:00 |
|
Evan Borgstrom
|
1f00eef6d0
|
[GH-93] re-applying changes...
|
2012-01-24 23:19:07 -05:00 |
|
Evan Borgstrom
|
8f0824af1a
|
Merge remote branch 'upstream/master'
Conflicts:
helpdesk/lib.py
helpdesk/management/commands/get_email.py
|
2012-01-24 14:49:17 -05:00 |
|
Ross Poulton
|
230f94f6aa
|
Merge pull request #108 from kratorius/fix-query-filtering
Sanity checks against input for ticket search
|
2012-01-23 15:16:56 -08:00 |
|
Ross Poulton
|
7e72f3d8ea
|
Merge pull request #106 from yekibud/master
adding global queue email settings for get_mail and HELPDESK_KB_ENABLED_STAFF; added ticket due date
|
2012-01-23 15:15:44 -08:00 |
|
Ross Poulton
|
17e6122fca
|
Merge pull request #104 from kratorius/csrf-api-fix
Exclude API calls from CSRF middleware.
|
2012-01-23 15:00:05 -08:00 |
|
Ross Poulton
|
62e9866254
|
Merge pull request #103 from kratorius/save-fix
Pass generic parameters to inherited model save()
|
2012-01-23 14:59:41 -08:00 |
|
Ross Poulton
|
a0a1875686
|
Merge branch 'master' of github.com:rossp/django-helpdesk
|
2012-01-23 22:51:38 +00:00 |
|
Ross Poulton
|
b63c480037
|
Merge alexgarel/django-helpdesk revision e4b4dd5 - Add CSS for printing
of tickets.
Closes GH-91.
|
2012-01-23 22:49:55 +00:00 |
|
Ross Poulton
|
6a18689faa
|
Merge pull request #101 from kratorius/closed-resolution-bugfix
Save resolution when closing the ticket
|
2012-01-23 14:44:45 -08:00 |
|
Ross Poulton
|
56c6ba9c12
|
Merge pull request #98 from kratorius/italian-support
Added italian translation for email templates
|
2012-01-23 14:42:11 -08:00 |
|
yekibud
|
3e8d6edfc7
|
commented out some unimplemented test code
|
2012-01-20 16:47:41 -08:00 |
|
tschmidt
|
1a4c6520a6
|
added due_date migration and added to edit ticket form
|
2012-01-20 15:03:07 -08:00 |
|
tschmidt
|
01b0adc733
|
adding due_date form and model field
|
2012-01-20 12:48:38 -08:00 |
|
Ivan Giuliani
|
5eb8b6eeb7
|
Silly mistake: reversed condition in 'if' check
|
2012-01-18 23:36:58 +01:00 |
|
tschmidt
|
0f38b688a1
|
fixed other instances of custom field list without blank default
|
2012-01-18 11:38:56 -08:00 |
|
tschmidt
|
9aa32cc4f6
|
fixed custom field list without blank default
|
2012-01-18 11:20:22 -08:00 |
|