7663 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Christie	8b7ebb9d2c	Fixed import sorting	2015-09-03 16:29:13 +01:00
Xavier Ordoquy	dcdd765647	Avoid passing allow_empty to the ListSerializer children.	2015-09-03 17:27:33 +02:00
Tom Christie	10da18b20b	Access settings lazily, not at module import	2015-09-03 16:24:13 +01:00
Tom Christie	39ec564ae9	Do not access settings on compat import	2015-09-03 14:22:13 +01:00
Tom Christie	7905e9f9f4	Docs tweak	2015-09-03 11:57:11 +01:00
Tom Christie	e9e88cbc60	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-09-03 11:24:07 +01:00
Tom Christie	f9d1a34fdd	Fix nested HTML dictionaries. Closes #3314.	2015-09-03 11:23:58 +01:00
Tom Christie	afd2a8f8f0	Adjust ModelField.null mappings now that Django-25320 is resolved	2015-09-03 10:12:52 +01:00
Lubomír Sedlář	a57ad07674	Add link to validators ... The `set_context` method there is the same as for the default field.	2015-09-03 10:35:28 +02:00
Tom Christie	ec007a7e2d	Merge pull request #3359 from raphaelmerx/master ... DurationField accepts integers	2015-09-03 09:30:45 +01:00
Lubomír Sedlář	1c049edd8c	Improve documentation of default argument for fields ... The documentation now not only mentions that callables are acceptable arguments, it also tells the reader what the callable should look like.	2015-09-03 09:46:54 +02:00
raphaelmerx	b9782b6850	DurationField accepts integers	2015-09-02 16:47:50 -07:00
Tom Christie	d48ec83688	Merge pull request #3358 from brittdawn/3357-self-tag-name-to-generic-relationships-docs ... Replacing self.tag with self.tag_name in Generic Relationships documentation.	2015-09-02 18:19:41 +01:00
Britt Dawn	7c12a988fa	Replacing self.tag with self.tag_name in Generic Relationships documentation.	2015-09-02 09:25:00 -07:00
Xavier Ordoquy	4dfc66e45d	Merge pull request #3352 from miki725/url-filter ... Added django-url-filter to 3rd party libraries	2015-09-01 08:52:57 +02:00
Miroslav Shubernetskiy	6926c71699	added django-url-filter to 3rd party libraries	2015-08-31 21:23:11 -04:00
Tom Christie	f87573ffa3	Merge pull request #3345 from jpadilla/fields ... Update ModelSerializer 'fields'/'exclude'/'__all__' behavior	2015-08-28 14:57:05 +01:00
Tom Christie	f34777a2e9	Translations for HTML filters	2015-08-28 14:55:22 +01:00
José Padilla	9dd1b2516b	Update ModelSerializer fields docs	2015-08-28 09:51:11 -04:00
koliber	dae5426e20	Changed formatting and updated docs	2015-08-28 15:35:32 +02:00
Tom Christie	3a0d54c7fb	Fix testing example. Closes #3346	2015-08-28 13:52:18 +01:00
Tom Christie	78632849cf	Comment against model_field.null 1.98 behavior	2015-08-28 13:29:57 +01:00
José Padilla	1fe8e9a0bf	Add note on deprecation path	2015-08-28 08:11:07 -04:00
José Padilla	f3ef13ab59	Update to match docs on ModelForm fields	2015-08-28 08:05:20 -04:00
Tom Christie	8db6367188	Deal with 1.9's differing null behavior on reverse relationships and m2m	2015-08-28 12:08:32 +01:00
Tom Christie	b51c1ff0b0	Django 1.9's test case HttpResponse.json() is not cachable.	2015-08-28 11:55:23 +01:00
Tom Christie	7560e8381f	Drop unused patterns	2015-08-28 10:53:44 +01:00
Tom Christie	6fa534f214	Fix urlpatterns in test	2015-08-28 10:44:49 +01:00
Tom Christie	a5ddd90df0	Log in and log out require escape and mark_safe	2015-08-28 10:27:49 +01:00
Tom Christie	24a2c3f5c3	Resolve unittest compat	2015-08-28 10:19:18 +01:00
Tom Christie	25c4c7f9fd	Pep8 fix	2015-08-28 10:03:16 +01:00
Tom Christie	e70da5ac6b	Compat for GenericForeignKey, GenericRelation	2015-08-28 10:03:08 +01:00
José Padilla	654e0e4527	Update ModelSerializer fields behavior	2015-08-27 13:09:08 -04:00
Tom Christie	4f27697467	Fix get_model import	2015-08-27 17:28:12 +01:00
Tom Christie	f691006f2c	Resolve generic fields import	2015-08-27 17:16:19 +01:00
Tom Christie	48540f180a	unittest compat fallback	2015-08-27 17:11:53 +01:00
Tom Christie	9aca6442a7	Add to the roadmap	2015-08-27 15:31:21 +01:00
Tom Christie	0b77e733a8	Don't display filter control on detail views	2015-08-27 14:35:39 +01:00
Tom Christie	9bcb1477e2	Minor tweaks	2015-08-27 14:28:28 +01:00
Tom Christie	aeb57913c9	Filter HTML refinments	2015-08-27 14:25:44 +01:00
Tom Christie	ea630bf3d1	Merge branch 'master' into filters	2015-08-27 14:02:15 +01:00
Tom Christie	f646b469d4	Copy tweaks	2015-08-26 13:22:18 +01:00
Tom Christie	eb37f90dcd	Tweak buisiness case	2015-08-26 13:09:22 +01:00
Tom Christie	32946f4160	Tweaks to roadmap	2015-08-25 14:03:30 +01:00
Tom Christie	8264222497	Merge branch 'master' of github.com:tomchristie/django-rest-framework	2015-08-25 13:32:42 +01:00
Tom Christie	086115c7b8	Clean up after publishing to PyPI	2015-08-25 13:32:35 +01:00
Tom Christie	3666b3f975	Merge pull request #3325 from slava-sh/patch-1 ... Fix typo	2015-08-24 19:45:19 +01:00
Slava Shklyaev	49d799c454	Fix typo	2015-08-24 21:09:08 +03:00
Tom Christie	1ba879278a	Merge pull request #3324 from Rikuoja/master ... Don't error on missing `search_fields` attribute.	2015-08-24 15:20:52 +01:00
Rikuoja	65df9fd5c6	Fix #3323	2015-08-24 17:02:49 +03:00