Commit Graph

858 Commits

Author SHA1 Message Date
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
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
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
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
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
Jonathan Barratt
0d8e81d7f0 Merge pull request #426 from meomap/email-fallback-locale
remove hardcode default locale
2016-10-15 22:38:54 -04:00
meomap
96f4fecb71 add setting for fallback locale 2016-10-14 15:04:28 +07:00
Ross Poulton
138904bf8b Update project URLs per #424 2016-10-12 11:14:10 +11:00
Ross Poulton
1f4ca64ef4 Update translations (part of #424) 2016-10-12 10:54:24 +11:00
Ross Poulton
979a13b402 Merge pull request #423 from tonioo/master
Fixed Meta class definition for TicketCustomFieldValue.
2016-10-10 10:11:32 +11:00
Antoine Nguyen
50955cb8f6 Fixed Meta class definition for TicketCustomFieldValue. 2016-10-07 11:00:25 +02:00
Ross Poulton
baab36653e Merge pull request #417 from ari3s/patch-1
Syntax correction for Python 3.4 and 3.5
2016-08-22 14:24:29 +10:00
Jan Beran
8341ad217c Syntax correction for Python 3.4 and 3.5 2016-08-17 22:01:09 +02:00
Ross Poulton
574009e375 Merge pull request #416 from gwasser/update_jquery
Update Static Copies of JS/CSS
2016-08-08 11:30:17 +10:00
Garret Wassermann
1c09f4a3c3 Moved Buttons and Priorities images back to main static folder 2016-08-05 00:50:40 -04:00
Garret Wassermann
014af24d2d Added a HELPDESK_USE_CDN setting, off by default, to select between using public CDNs as before, and an up-to-date static copy 2016-08-05 00:38:17 -04:00
Garret Wassermann
d9480c9cf0 Update static jQuery and other js/css, disable CDN usage 2016-08-04 23:57:35 -04:00
Ross Poulton
f2e497c3c6 Merge pull request #415 from mhannig/fix-broken-keyword-search
JSON Serialization broke Keyword-Searches
2016-07-05 08:48:10 +10:00
Matthias Hannig
a37f7145ec Serializing the query using JSON for SavedSearches unfortunately broke
Keyword-Searches.

Now, only the search string is serialized for saving and
the "qset" is moved from "other_filters" to apply_query.
2016-07-04 17:47:53 +02:00
Ross Poulton
03b3a70975 Merge pull request #410 from mrkiwi-nz/fix_savequery
Fix savequery
2016-06-30 10:36:41 +10:00
Ross Poulton
da5a4dc40f Merge pull request #411 from mrkiwi-nz/issue_408_fix
fix #408 : Bug in test_per_queue_staff_permission.py
2016-06-30 10:36:20 +10:00