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

703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Seeholzer
25aac19692 Merge pull request #2 from ssadler/django-1.8 
Merge rossp master and fix test bug
 2015-11-06 16:35:54 +01: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
Ross Poulton
387cc413a0 Merge pull request #340 from fjcapdevila/master 
Fix typo in docs.
 2015-09-15 09:27:15 +10:00
Francisco Capdevila
29be47bd65 Merge pull request #1 from fjcapdevila/fix_typo_in_docs 
Fix typo
 2015-09-14 09:51:40 -03:00
Francisco Capdevila
3bc7ed64ee Fix typo 2015-09-14 09:47:40 -03: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
Ross Poulton
84330eeebb Merge pull request #332 from reduxionist/per-queue-staff-membership 
Per queue staff membership
 2015-06-15 19:18:15 +10:00
Alex Seeholzer
f9682ccf37 renamed test __init__.py imports to new test naming scheme 2015-06-12 15:52:35 +02:00
Alex Seeholzer
4f8fb983a8 Merge branch 'master' into django-1.8 2015-06-12 15:51:45 +02:00
Alex Seeholzer
da30d2b973 tests renamed for compliance 2015-06-12 15:48:38 +02:00
Alex Seeholzer
0311331181 Merge branch 'master' into django-1.8 
* master:
  removed unneccessary lines from quicktest.py and added source
 2015-06-12 15:38:08 +02:00
Alex Seeholzer
55dd80fa06 removed unneccessary lines from quicktest.py and added source 2015-06-12 15:35:58 +02:00
Alex Seeholzer
ca9d7bc5c4 Merge branch 'master' into django-1.8 2015-06-12 15:31:12 +02:00
Alex Seeholzer
05625d0bfd added test running compatibility for django 1.8, workin in 1.6 and 1.7 2015-06-12 15:30:54 +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
Alex Seeholzer
f5401b6887 Merge remote-tracking branch 'upstream/master' 2015-06-12 10:42:02 +02: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
Ross Poulton
9807356e84 Merge pull request #331 from reduxionist/fix-reports_CHOICES_display 
As of at least Django 1.5, calling __str__() on a CHOICES object…
 2015-06-11 20:23:27 +10: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
Ross Poulton
140c241cfe Merge pull request #329 from reduxionist/patch-1 
Update install.rst
 2015-06-10 09:34:14 +10:00
Ross Poulton
3d8acca6db Merge pull request #330 from reduxionist/issue_286-header_cuts_off_body 
Fix issue 286: Header cuts off body…
 2015-06-10 09:33:36 +10:00
Jonathan Barratt
fd6988aad7 Add STATIC_URL setting to quicktest.py so that tests pass for Django versions 1.5 through 1.7 2015-06-03 15:42:35 +07: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
caa1ec242a Update install.rst 
Change example urls.py URL patterns from raw tuples to url(...) calls, for Django 1.8 (and possibly 1.5+) compatibility.
 2015-06-03 13:04:46 +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
flinz
47cdcab864 Merge pull request #1 from rossp/master 
Updated master
 2015-06-02 10:45:49 +02:00
Ross Poulton
1ff45f4e1b Merge pull request #322 from atmaniak/master 
Fix exception for templetags
 2015-05-12 17:05:52 +10: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
93cb72f3ec Merge pull request #314 from atmaniak/master 
Preliminary support for python 3 & django 1.7
 2015-04-28 09:13:22 +10:00
Ross Poulton
525ffce49b Merge branch 'atmaniak-master' 2015-04-28 09:14:04 +10:00
Ross Poulton
70c57f9096 Merge 2015-04-28 09:13:54 +10:00
Ross Poulton
ffb6243af0 Merge pull request #320 from tony-zhu/master 
Remove deprecated load url from future
 2015-04-17 08:42:52 +10:00
Tony Zhu
ed9581e5de Remove deprecated load url from future 2015-04-16 11:58:24 -04:00
Ross Poulton
2776b897c8 Merge pull request #319 from tony-zhu/master 
Remove no effect model property to silence django 1.8 system check warning
 2015-04-15 11:16:13 +10: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
Emmanuel Cohen
eb3beb0dc9 Fix statistics for python 3 (still compatible with python 2) 2015-03-27 16:33:31 +01:00
Emmanuel Cohen
f84da6c443 Preliminary support for python 3 & django 1.7 2015-03-27 16:22:37 +01:00
Ross Poulton
5e0ee1e37c Add bootstrapform to install docs. Closes #307. 2015-02-23 14:24:53 +11:00
Ross Poulton
ae146c2e7f Remove reference to django.contrib.markup in install docs. (#255) 2015-02-23 14:22:28 +11:00