142 Commits

Author	SHA1	Message	Date
Tom Christie	10dbf1316f	Added JSONField. Closes #3170.	2015-09-28 17:25:52 +01:00
Carlton Gibson	45ace5010e	Remove OrderedDict fallback	2015-09-22 16:35:38 +02:00
Carlton Gibson	0b34408172	Remove unittest.skipUnless	2015-09-22 16:24:22 +02:00
Carlton Gibson	6e86a53c92	Remove apps.get_model fallback ... * Corrects presumed logic error in `ResolveModelWithPatchedDjangoTests`	2015-09-22 16:14:45 +02:00
Carlton Gibson	68c88e180f	Remove ContentType import fallback	2015-09-22 15:55:39 +02:00
Carlton Gibson	8ea1606abf	Remove Django 1.5 clean_manytomany_helptext fallback	2015-09-21 20:16:52 +02:00
Carlton Gibson	25de8c960f	Remove Django 1.5 get_model_name fallback	2015-09-21 20:10:31 +02:00
Carlton Gibson	e625cff8a5	Remove Django 1.5 URLValidator fallback	2015-09-21 16:22:46 +02:00
Carlton Gibson	9216dc9a25	Remove Django 1.5 EmailValidator fallback	2015-09-21 16:20:07 +02:00
Tom Christie	a3067bea55	Merge branch 'master' into version-3.3	2015-09-17 16:24:46 +01:00
Tom Christie	39ec564ae9	Do not access settings on compat import	2015-09-03 14:22:13 +01:00
Tom Christie	24a2c3f5c3	Resolve unittest compat	2015-08-28 10:19:18 +01:00
Tom Christie	e70da5ac6b	Compat for GenericForeignKey, GenericRelation	2015-08-28 10:03:08 +01:00
Tom Christie	4f27697467	Fix get_model import	2015-08-27 17:28:12 +01:00
Tom Christie	48540f180a	unittest compat fallback	2015-08-27 17:11:53 +01:00
Tom Christie	b4b2dc18fa	Clean-up refactoring of SearchFilter implementation	2015-08-20 11:35:32 +01:00
Tymur Maryokhin	4e5da16961	Remove Django 1.4 compat code	2015-08-07 00:02:29 +02:00
Tom Christie	877e964d7e	Don't need to support Django 1.4 with FilePathField.	2015-08-03 10:15:28 +01:00
Tom Christie	8d7c0a8474	Merge branch 'feature/filepathfield' of https://github.com/Ins1ne/django-rest-framework into Ins1ne-feature/filepathfield	2015-08-03 10:09:46 +01:00
Tom Christie	c8ad0cce19	Bump minimum Django version to 1.5	2015-07-30 15:43:39 +01:00
Aider Ibragimov	a1397ac699	fix bugs, move version branching to compat, update ModelSerializer mapping	2015-07-19 00:26:03 +03:00
José Padilla	7351a3f6ca	Sort imports with isort	2015-06-25 16:55:51 -04:00
José Padilla	83c9136c90	Cleanup import following PEP 8 style guide	2015-06-25 16:10:17 -04:00
Markus Korn	b42b16d0e6	compat: invert logic for checking the django version when implementing ... RequestFactory.generic()	2015-06-22 16:13:42 +02:00
Markus Korn	06c61fc511	compat: only add compat implementation of RequestFactory.generic() if not ... provided by django	2015-06-22 14:05:56 +02:00
hellysmile	c292b3d132	Fix set_rollback on @transaction.non_atomic_requests.	2015-06-08 07:10:57 +03:00
Nicolas Delaby	c2d2417237	Tell default error handler to doom the transaction on error ... if `ATOMIC_REQUESTS` is enabled.	2015-06-02 09:19:58 +02:00
Nicolas Delaby	f701ecceb7	Add DurationField	2015-06-01 18:20:53 +02:00
Petros Moisiadis	a13075486d	Compatibility code for getting user model ... Compatibility code for getting user model	2015-05-19 17:57:27 +03:00
Carlton Gibson	c5eb5b2201	Move importlib fallback into compat.	2015-02-17 11:55:15 +01:00
Tom Christie	4ee4b4f2dc	Merge master	2015-01-30 14:00:25 +00:00
Tom Christie	35f6a82462	Added DictField and support for HStoreField.	2015-01-23 16:27:23 +00:00
Tom Christie	9ec08ce578	Merge master	2015-01-21 13:12:14 +00:00
Tom Christie	da6ef3d0b0	Allow missing fields option for inherited serializers. Closes #2388.	2015-01-21 13:03:37 +00:00
Tom Christie	6065cdbd93	Merge master	2015-01-19 15:16:57 +00:00
Tom Christie	4f3c3a06cf	Drop trailing whitespace on indented JSON output. Closes #2429.	2015-01-19 14:41:10 +00:00
Fabien Bochu	5484d570cb	Fix timedelta JSON serialization on Python 2.6.	2015-01-19 13:09:08 +01:00
Tom Christie	b33a6cbff1	Ensure urlparse is not publically exposed in compat.py - less chance of accidental conflict.	2015-01-08 14:16:58 +00:00
Ryan Gaffney	07ad0474c0	Fix compatibility comment regarding OrderedDict	2015-01-06 14:34:36 -08:00
Tom Christie	6168f60ba8	Merge branch 'master' into version-3.1	2015-01-05 11:02:28 +00:00
Tom Christie	efa5942ce1	Support namespaced router URLs with DefaultRouter.	2014-12-28 12:02:52 +00:00
Tom Christie	fe9647ce92	AcceptHeaderVersioning to return unicode strings.	2014-12-16 16:37:32 +00:00
Tom Christie	b6ee784240	Merge master	2014-12-15 12:18:55 +00:00
Tom Christie	72e08a3e8b	Use unicode internally everywhere for 'repr'	2014-12-15 11:55:17 +00:00
Tom Christie	baaa356489	Merge master	2014-12-12 15:37:43 +00:00
Tymur Maryokhin	001884a192	Removed unused compat code	2014-12-04 16:06:43 +01:00
Tymur Maryokhin	95af92ca01	Removed custom urlparse compat	2014-12-04 15:47:42 +01:00
Tymur Maryokhin	d54c67d79d	Removed custom StringIO, force_text, smart_text compat	2014-12-04 03:11:42 +01:00
Tymur Maryokhin	09e59f2686	Removed custom python_2_unicode_compatible. Closes #2183	2014-12-04 02:50:25 +01:00
Tom Christie	3d6620c72a	Merge	2014-12-03 23:24:06 +00:00