5960 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Omer Katz	67ff078388	Renamed the cached fields lists.	2015-05-17 09:54:33 +03:00
Tom Christie	e33fed70d6	Merge pull request #2940 from rapilabs/master ... Allow unexpected values for ChoiceField/MultipleChoiceField representations	2015-05-15 16:54:55 +01:00
David Sanders	b7edd46313	Use simpler dict.get() rather than try/except	2015-05-16 01:01:27 +10:00
tony	0906bf2c08	fix empty and_query	2015-05-15 16:44:12 +03:00
tony	de95598a1e	removed using view.model.objects	2015-05-15 13:46:56 +03:00
David Sanders	8e84a9f6d0	Allow invalid outputs to pass through to_representation() for ChoiceField & MultipleChoiceField	2015-05-15 18:59:10 +10:00
Tom Christie	b4d82a0f55	Preserve format query param	2015-05-15 09:18:45 +01:00
tony	c47ec60ea2	no need to do distinct on every loop cycle & add analogue of distinct for oracle users	2015-05-14 17:04:22 +03:00
tony	7813d2fb35	fix DISTINCT for Oracle databases	2015-05-14 13:57:36 +03:00
Xavier Ordoquy	6add1acc4e	Add a few cosmetic changes to the release notes.	2015-05-14 11:18:18 +02:00
Xavier Ordoquy	475e431055	Fix the broken links.	2015-05-14 11:15:26 +02:00
Xavier Ordoquy	1a8c0b4bfc	Merge pull request #2930 from linovia/release/3.1.2 ... Release 3.1.2	2015-05-14 10:57:33 +02:00
Alex Rothberg	a804d0bd75	set the action when override_method regardless of its None-ness	2015-05-13 22:53:32 -04:00
Xavier Ordoquy	47d36f150b	Add last minute PR.	2015-05-13 18:24:06 +02:00
Tom Christie	ea1145c5aa	Merge pull request #2905 from ticosax/django-object-perm-get_queryset ... Allow DjangoObjectPermissions to use views that define get_queryset	2015-05-13 13:39:59 +01:00
Nicolas Delaby	031ac2a292	Allow DjangoObjectPermissions to use views that define get_queryset	2015-05-13 14:26:44 +02:00
Xavier Ordoquy	fb4ba3ad3c	Bump version to 3.1.2	2015-05-13 09:44:15 +02:00
Xavier Ordoquy	5c8df2c56b	Release notes for 3.1.2	2015-05-13 09:44:04 +02:00
Tom Christie	9424e59b9e	Styling of nested lists/objects in detail view	2015-05-12 16:28:49 +01:00
Tom Christie	a1421cd4a3	Basic formatting for dict and list values	2015-05-12 16:18:45 +01:00
Tom Christie	9a504efd26	Basic formatting for admin cells	2015-05-12 15:21:49 +01:00
Tom Christie	995aa47570	First pass templates for admin style	2015-05-12 14:49:09 +01:00
Marco Vellinga	478b1dbd06	Use get_queryset() for RelatedField choices property instead of self.queryset.all()	2015-05-11 15:28:10 +02:00
José Padilla	21cb808569	Merge pull request #2921 from donkirkby/patch-1 ... minor grammar fix	2015-05-10 18:44:21 -04:00
Omer Katz	1ee3173583	Cache fields list for to_internal_value and to_representation.	2015-05-09 14:37:49 +03:00
Don Kirkby	0b8dd906cf	minor grammar fix	2015-05-08 15:28:30 -07:00
Kevin Brown	35efbe41ab	Merge pull request #2917 from respondcreate/master ... Adding django-versatileimagefield to DRF 3rd party docs	2015-05-07 16:14:26 -04:00
Jonathan Ellenberger	44317b4581	Adding django-versatileimagefield to DRF 3rd party docs ... Closes WGBH/django-versatileimagefield#12	2015-05-07 14:23:24 -04:00
José Padilla	3a96164501	Merge pull request #2914 from trollknurr/master ... Added link to djangorestframework-word-filter package	2015-05-06 12:11:04 -04:00
tony	b0b26d6b68	Added link to djangorestframework-word-filter package	2015-05-06 13:40:01 +03:00
José Padilla	a7d5e32193	Merge pull request #2909 from sheppard/update-wq ... update info about wq.db.rest router	2015-05-05 16:09:18 -04:00
S. Andrew Sheppard	e9b6b47872	update info about wq.db.rest router	2015-05-05 13:38:14 -05:00
Tom Christie	859c20804c	Merge pull request #2907 from mrunge/master ... Separate LICENSE and README to two files.	2015-05-05 14:46:49 +01:00
Matthias Runge	04084c96a0	Separate LICENSE and README to two files.	2015-05-05 14:48:30 +02:00
Tom Christie	2e85b4ec3c	Merge pull request #2890 from radyz/fixed-doc-for-get-paginated-response-method ... Document correct method usage for get_paginated_response	2015-05-05 09:15:28 +01:00
Tom Christie	4db35a2380	Merge pull request #2902 from soloradish/master ... Delete imported but not used method	2015-05-05 09:12:15 +01:00
lowid	4996748575	Merge pull request #1 from soloradish/API-Guide-Authentication-patch ... Delete imported but not used method	2015-05-04 18:17:17 +08:00
lowid	5c3c4802d3	Delete imported but not used method ... In 'Generating Tokens' section, the example code imported get_user_model but not used.	2015-05-04 18:15:49 +08:00
Ernesto Chavez Sanchez	2b4dd739cc	Fixed description for get_paginated_response method in generic-views and example using it with @list_route decorator in viewsets.	2015-05-03 22:00:05 +00:00
José Padilla	7932f2c6f8	Merge pull request #2899 from maryokhin/patch-3 ... Fix Invalid keyword model with generic views	2015-05-02 08:00:41 -04:00
Tymur Maryokhin	d19c3cc973	Remove deprecated model attribute reference. Closes #2896.	2015-05-01 20:32:52 +02:00
Tom Christie	abcd6f2b9e	Merge pull request #2869 from ryangallen/datefield ... DateField to_representation can handle str and empty values. Fixes #2656, #2687.	2015-05-01 16:33:43 +01:00
Ernesto Chavez Sanchez	0ffb0abe81	Document correct method usage for get_paginated_response in 3.x instead ... of old get_pagination_serializer only valid in 2.x	2015-04-30 02:23:39 +00:00
Tom Christie	2eb9107b87	Merge pull request #2798 from Boomerangz/depth-should-reduce ... Depth should reduce on nested ModelSerializer classes.	2015-04-27 16:22:22 +01:00
Tom Christie	2394577dc2	Merge pull request #2757 from ekiourk/2630/Raise-exception-when-ModelSerializer-used-with-abstract-model ... Raise error when ModelSerializer used with abstract model	2015-04-27 14:47:32 +01:00
José Padilla	2b6726e703	Merge pull request #2842 from frnc/patch-1 ... Update 5-relationships-and-hyperlinked-apis.md	2015-04-26 12:13:57 -04:00
José Padilla	9809f4d36a	Merge pull request #2809 from aparsons/master ... Move ul.breadcrumb margin to bootstrap-tweaks.css	2015-04-26 11:15:50 -04:00
Tom Christie	450c541462	Merge pull request #2868 from ticosax/versioning-header-all ... Check AcceptHeaderVersioning with content negotiation in place	2015-04-24 15:19:51 +01:00
Tom Christie	c397705217	Merge pull request #2873 from ByteInternet/fix-exception-handler-docs ... Remove mention of Django's built-in ValidationError in docstring	2015-04-24 14:43:23 +01:00
Allard Hoeve	9a794beb1e	Remove mention of Django's built-in ValidationError in docstring ... The `exception_handler` does not actually handle django.core.exceptions.ValidationError, so remove any mention of it. This closes #2872	2015-04-24 15:37:42 +02:00