Commit Graph

526 Commits

Author SHA1 Message Date
Carlton Gibson d2bda5a3b9 Merge pull request #303 from alex/develop
Version 0.12.0 Release
2016-01-07 20:50:29 +01:00
Carlton Gibson e1f40b00b4 Update CHANGES and version for release 2016-01-07 20:46:25 +01:00
Carlton Gibson 5388e44ddd Merge branch 'master' into develop
# Conflicts:
#	requirements/test.txt
2016-01-07 20:32:23 +01:00
Carlton Gibson b360f8b7b1 Merge pull request #221 from jpadilla/develop
Allow value and human readable option
2016-01-07 20:27:29 +01:00
Carlton Gibson 4ccea3113e Merge pull request #349 from pilnujemy/fix-pep8
Small fixes for PEP8
2016-01-07 20:23:46 +01:00
Adam Dobrawy f4688feb7d PEP8 fix 2016-01-04 07:18:07 +01:00
José Padilla 7f974045c9 Add docs for custom lookup types 2015-12-28 07:47:48 -04:00
Carlton Gibson ea4c84f1f6 Merge pull request #336 from nikolas/django1.9
test on final version of django 1.9
2015-12-09 16:27:49 +01:00
Nik Nyby 229c1ed73c test on final version of django 1.9 2015-12-03 21:49:13 -05:00
Carlton Gibson feff45319d Merge pull request #335 from timothymullen/patch-1
Correct wrong function name in MethodFilter example
2015-12-01 21:45:10 +01:00
timothymullen 922ec276a2 used wrong function name in MethodFilter example 2015-12-01 13:12:35 -05:00
Carlton Gibson 7df668c6ed Merge pull request #307 from carltongibson/django-compatibility-updates
Update compatibility with current Django/Python
2015-11-23 11:16:15 +01:00
Carlton Gibson acd3ee2d49 Merge pull request #1 from rpkilby/django-compatibility-updates
Merge develop, resolve deprecation notifications
2015-11-23 10:42:30 +01:00
Ryan P Kilby a5fb0850fb Consolidate shell/test settings, replace syncdb w/ migrate 2015-11-23 03:06:24 -05:00
Ryan P Kilby 3696ac6f8d Replace deprecated IPAddressField with GenericIPAddressField 2015-11-23 02:56:23 -05:00
Ryan P Kilby a942bf4377 Remove django<1.8 check 2015-11-23 02:53:38 -05:00
Ryan P Kilby f8bd87886d Remove more UUIDField checks 2015-11-23 02:53:31 -05:00
Ryan P Kilby fc2a4d6012 Remove python 2.6 deepcopy patch 2015-11-23 01:26:50 -05:00
Ryan P Kilby 558e85ef2d Merge branch '290-cleanup' into django-compatibility-updates 2015-11-23 00:45:10 -05:00
Ryan P Kilby fd425e64ed Merge branch 'develop' into django-compatibility-updates
Conflicts:
	.travis.yml
	README.rst
	django_filters/fields.py
2015-11-23 00:43:02 -05:00
Ryan P Kilby 4eff26e5c4 Fixes #290, handles deprecation notices 2015-11-23 00:19:25 -05:00
Carlton Gibson 431d4484cf Merge pull request #328 from suqi/develop
Add support for GenericIPAddressField(A new field type since django1.7)
2015-11-17 09:05:50 +01:00
suqi 0577d002bb Add filter support for GenericIPAddressField(A new field type since django1.7) 2015-11-17 12:51:29 +08:00
Carlton Gibson 1b24a6da58 Specify coverage version for Travis 2015-11-13 09:10:15 +01:00
Carlton Gibson e5f194c5b0 Merge branch 'pvergne-patch-1' — Fix typo in docs. 2015-11-13 08:55:55 +01:00
Carlton Gibson a7bb66fa93 Pin coverage to 3.7.1 for Python 3.2 2015-11-13 08:55:21 +01:00
Pablo Vergne a2b8a39d91 Fix typo in widgets.txt 2015-11-12 15:18:39 -03:00
Carlton Gibson d647b814eb Merge pull request #311 from gonzalobustos/develop
add spanish (argentina) translation
2015-10-20 10:22:10 +02:00
Carlton Gibson f8c5b0cd03 Merge pull request #319 from int-ua/develop
Typo fixed
2015-10-20 10:21:01 +02:00
Carlton Gibson ae7c42536c Merge pull request #318 from int-ua/patch-1
Typo fixed
2015-10-20 10:20:28 +02:00
Serhiy Zahoriya 6a763902ce Typo fixed 2015-10-19 19:01:00 +03:00
Serhiy Zahoriya ce3e76470b Typo fixed 2015-10-19 18:59:39 +03:00
Carlton Gibson 979f921002 Merge pull request #317 from rpkilby/drop-django-17
Make Django 1.8 the minimum supported version
2015-10-19 09:22:04 +02:00
Ryan P Kilby 2733907d33 Drop UUID field condition check 2015-10-19 03:17:23 -04:00
Ryan P Kilby 3d4a4e6ae2 Cleanup imports, deprecations 2015-10-19 03:17:23 -04:00
Ryan P Kilby 4d04589678 Update travis config
- Require Django 1.8+
- Drop python 2.6, add python 3.5
2015-10-19 03:16:29 -04:00
Carlton Gibson 6d04d5bd6b Merge pull request #316 from rpkilby/fix-pytz-localization
Fix datetime localization in tests when pytz is installed
2015-10-19 09:07:54 +02:00
Ryan P Kilby b5dd5bb521 Use Django's timezone utils to handle awareness 2015-10-18 15:56:52 -04:00
Carlton Gibson 9cc03ee74b Merge pull request #313 from rpkilby/runshell-compatibility
Fix runshell compatibility with django >= 1.7
2015-10-15 10:07:02 +02:00
Ryan P Kilby 4edfe5910c Fix runshell compatibility with django >= 1.7 2015-10-15 02:19:58 -04:00
Gonzalo Bustos 78abd4e2e3 add spanish (argentina) translation 2015-10-11 20:54:37 -03:00
Carlton Gibson adb68f73a0 Merge pull request #309 from yrik/patch-2
use `count(*)` instead of `select * from table`;
2015-10-08 21:59:10 +02:00
Carlton Gibson b64a7b4af9 Merge pull request #308 from bogdal/range-widget-attrs
RangeWidget attributes
2015-10-08 21:52:09 +02:00
Iurii Kriachko be036af804 use `count(*)` instead of `select * from table`; 2015-10-07 23:13:26 +03:00
Adam Bogdał 76dddd233a Add test for widget attrs 2015-10-07 16:07:25 +02:00
Adam Bogdał 35292cb9a7 Use widget classes instead of instances 2015-10-07 01:22:37 +02:00
Carlton Gibson 527c1afa65 Adjust supported versions in README 2015-10-05 10:55:54 +02:00
Carlton Gibson 199f05b388 Remove Django 1.4 fallbacks 2015-10-05 10:51:15 +02:00
Carlton Gibson c9bcfbe2c5 Remove Django 1.4 and Python 2.6 from test matrix 2015-10-05 10:48:51 +02:00
Carlton Gibson f9237c415c Exclude Django 1.4/1.7 against Python 3.5 2015-10-05 10:37:11 +02:00