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

877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Barratt
cbbad8d370 Merge pull request #442 from reduxionist/pr/420-merge-corrections 
cleanup build-breaking whitespace merge errors
 2016-10-29 15:04:39 +07:00
Jonathan Barratt
28308d19fb
cleanup build-breaking whitespace merge errors 2016-10-29 14:59:14 +07:00
Jonathan Barratt
26c0f2e59f Merge pull request #441 from alexbarcelo/api-prune 
Remove all the deprecated API related files and references
 2016-10-29 14:12:31 +07:00
Alex Barcelo
53ed0d3a2c Remove all the deprecated API related files and references 2016-10-29 08:50:13 +02:00
Jonathan Barratt
43c067dd4f
merge changes from updated master 2016-10-29 13:35:03 +07:00
Jonathan Barratt
790f1fc003 Merge pull request #374 from alexbarcelo/urls_app_name 
Set app_name as 'helpdesk' at the urls.py, and droping url prefixes
 2016-10-28 15:59:29 +07:00
Jonathan Barratt
4ea17c8e6a Merge pull request #436 from gwasser/0.2 
Set version to 0.2.0, remove Django 1.7 from requirements and testing
 2016-10-28 15:02:27 +07:00
Jonathan Barratt
69e24acbca
Merge branch 'gwasser-0.2' 2016-10-28 14:59:47 +07:00
Garret Wassermann
904a83e2fe
Remove Django 1.7 from requirements and testing, set version to 0.2.0 2016-10-28 14:59:03 +07:00
Garret Wassermann
c5be3e7c45
Remove Django 1.7 from requirements and testing, set version to 0.2.0 2016-10-28 14:28:59 +07:00
Jonathan Barratt
44fd60970b Merge pull request #438 from alexbarcelo/autocodestyle 
More Code Style --PEP8-centric
 2016-10-28 10:44:55 +07:00
Jonathan Barratt
b1e9bc4e93 Merge pull request #440 from reduxionist/update-packaging-files 
Update packaging files before release of 0.1.18 to PyPI
 2016-10-28 10:10:36 +07:00
Jonathan Barratt
203de6aa51
add maintainer and update url and keywords in setup.py 2016-10-27 15:08:48 +07:00
Jonathan Barratt
de384af4f8
replace non-existent UPGRADE with updated AUTHORS in MANIFEST.in 2016-10-27 15:08:48 +07:00
Jonathan Barratt
d5502bb00d
fix typo in README.rst and its filename in MANIFEST.in 2016-10-27 15:07:51 +07:00
Jonathan Barratt
8a63c9e9e6
remove CHANGELOG that was last updated six years ago 2016-10-27 15:02:44 +07:00
Alex Barcelo
6761ad6c10 fixing RST syntax for docstring on akismet.py 2016-10-26 10:22:15 +02:00
Alex Barcelo
94162303d6 adding pep8 test for Travis 2016-10-24 10:06:36 +02:00
Alex Barcelo
f017adea63 fixing those two python files 2016-10-24 10:05:41 +02:00
Alex Barcelo
89a6ae01b8 Fixing style (according to branch 'autocodestyle') + quicktest 2016-10-24 08:04:31 +02:00
Alex Barcelo
179ceb2f82 fixing style on tests 2016-10-23 22:10:32 +02:00
Alex Barcelo
30e3aa55aa almost auto-fix on misc files 2016-10-23 22:09:17 +02:00
Alex Barcelo
3c35473265 fixing views.py (except deprecated api) 2016-10-23 22:02:02 +02:00
Jonathan Barratt
0159ca1ffa Merge pull request #435 from alexbarcelo/codestyle 
General clean-up and opinionated coding style
 2016-10-22 06:05:22 +07:00
Alex Barcelo
94d51cb817 Minimal settings for .pylintrc (loading pylint_django plugin) 2016-10-21 17:14:34 +02:00
Alex Barcelo
24d88be8d9 Initial general clean-up of stuff 2016-10-21 17:14:12 +02:00
Jonathan Barratt
5e340338b4 Merge pull request #432 from flinz/coverage 
Added coverage generation to testing, consumed by codecov in CI
 2016-10-21 15:00:54 +07:00
Garret Wassermann
d7875587b7 Revert previous change 2016-10-20 12:05:28 -04:00
Garret Wassermann
884662dd21 Ensure binary data is returns so Django can decode it 2016-10-20 11:46:09 -04:00
Garret Wassermann
dfb7987ebb Remove emails from queue in test_get_email 2016-10-20 11:17:51 -04:00
Alex Seeholzer
00b9dce0e9 Added coverage generation to testing, consumed by codecov in the CI build (+4 squashed commits) 
Squashed commits:
[dadf579] switched to codecov from coveralls
[76f5184] added badge to Readme; debugging travis script;
[8b2a807] Testing submission to coveralls
[675ac37] Added coveralls support for travis
 2016-10-20 14:00:51 +02:00
Jonathan Barratt
93522f4ef9 Merge pull request #430 from alexbarcelo/django110 
Updating documentation and support for Django 1.10
 2016-10-20 15:57:37 +07:00
Garret Wassermann
197fad99d2 Remove mail templates since we're not testing them here; might be good to include a test for this elsewhere 2016-10-20 02:48:14 -04:00
Garret Wassermann
5e93297787 Fix call_command options for correct format to work with Django 1.7+ 2016-10-20 02:29:23 -04:00
Alex Barcelo
c1330bc0c7 Updating documentation for Django 1.10 support and settings 2016-10-20 08:26:31 +02:00
Alex Barcelo
8e626af41f fixing TEMPLATES on the test settings 2016-10-20 08:26:06 +02:00
Alex Barcelo
40c046e993 Adding Django 1.10 to Travis 2016-10-20 08:25:37 +02:00
Garret Wassermann
6418194b85 Fix command line arg for Django 1.7 and make Python 2 and 3 compatible test 2016-10-20 02:21:43 -04:00
Garret Wassermann
9606201200 Fix mock tests for get_email (hopefully for good this time) 2016-10-20 02:09:05 -04:00
Garret Wassermann
b7ef83f7d2 Check that folder is a dir before checking for mail using get_email; fix unit test for --quiet 2016-10-20 01:39:24 -04:00
Garret Wassermann
e3c9e04feb Fix python module naming in get_email test 2016-10-20 01:25:16 -04:00
Jonathan Barratt
af893bdcc8 Merge pull request #428 from jflesch/master 
Fix form translations
 2016-10-20 12:16:31 +07:00
Jonathan Barratt
855c0b07be Merge pull request #429 from reduxionist/PR412-resubmit 
Thanks again for the contribution @mrkiwi-nz, and my apologies for accidentally closing the original PR!
 2016-10-20 12:08:00 +07:00
Daryl
3b181e87ef
Fix inconsistent indentation 2016-10-20 11:43:22 +07:00
Garret Wassermann
c9c7642724 New unit test for get_email command 2016-10-19 21:37:23 -04:00
Garret Wassermann
f61d180e5d use django.utils.six instead of plain six 2016-10-19 20:02:12 -04:00
Alex Barcelo
91afbb9755 fixing some additional reverse stuff 2016-10-19 15:30:37 +02:00
Alex Barcelo
afd6ebad74 Merge current 'master' state into urls_app_name 2016-10-19 15:26:04 +02:00
Jerome Flesch
74668f30d5 forms.py : To get the translations for the fields' labels, use ugettext_lazy() instead for ugettext(). 
ugettext() loads the translations at the same time the module is loaded (--> always in english).
ugettext_lazy() loads them when they are needed (--> when the user makes a query --> we known the language the user wants based on the header of their HTTP request)

Signed-off-by: Jerome Flesch <jflesch@gmail.com>
 2016-10-18 15:37:57 +02:00
Jerome Flesch
0ad110ec7f forms.py: cleanup whitespaces 
Signed-off-by: Jerome Flesch <jflesch@gmail.com>
 2016-10-18 15:35:41 +02:00