encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-30 13:34:00 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,670 Commits 18 Branches 132 Tags 105 MiB
3c31222a41
Commit Graph

171 Commits

Author SHA1 Message Date
Tom Christie
3c31222a41 Merge branch 'master' of https://github.com/sunscrapers/django-rest-framework 2012-12-14 20:11:37 +00:00
Tom Christie
39b01d6802 Ensure context is passed to dynamically added fields. Fixes #476. 2012-12-14 19:59:29 +00:00
Simon Pantzare
9eaf8e4330 Test to verify that context is passed on 
The paginator and its object serializer should share the same context.
 2012-12-14 19:59:29 +00:00
Szymon Teżewski
5f08ec70e2 context to custom field in pagination 2012-12-13 12:07:56 +01:00
Tom Christie
497da7fc69 Clean up field initialization. Fixes #497 2012-12-12 20:45:06 +00:00
Tom Christie
4058223309 Fix broken nested fields 2012-12-11 21:07:25 +00:00
George Kappel
80f15c598a Added depth test 2012-12-11 09:14:52 -06:00
Marko Tibold
d0935d1fbb get_excluded_fieldnames() should respect Meta options' ability to be either a tuple or list. Fixes #490. 
Refactored `if self.opt.fields` out of the for loop.
Updated and cleaned up the validation-tests.
 2012-12-10 23:10:04 +01:00
Tom Christie
936fdfb78e More tests for nullable FKs 2012-12-08 12:48:27 +00:00
Tom Christie
f72be7b8fa Add test for m2m create 2012-12-08 12:29:35 +00:00
Tom Christie
c911d54ae3 Reverted #458 
When incorrect parameters are supplied to the obtain auth token view
400 *is* the correct response.
 2012-12-07 22:25:16 +00:00
Tom Christie
303bc7cf95 Support nullable FKs, with blank=True 2012-12-07 21:32:45 +00:00
Tom Christie
a5178e9a36 Merge pull request #451 from markotibold/#431 
Call model's .full_clean() method, eg. to validate uniqueness
 2012-12-07 12:34:56 -08:00
Tom Christie
6ffcd7ba36 Merge pull request #477 from roberts81/master 
Fix for #460
 2012-12-06 14:54:28 -08:00
Marko Tibold
c65f22e0e4 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into #431 2012-12-06 23:47:47 +01:00
Tom Christie
e2175eb71b Merge pull request #462 from asfaltboy/modelserializer_traverse_related 
ModelSerializer traverse related
 2012-12-06 14:35:57 -08:00
Ben Roberts
cb7d9ea5c9 cleaned up white space & docstring styling 2012-12-06 12:45:50 -07:00
Ben Roberts
7f28a78414 cleaned up last commit 2012-12-05 17:54:21 -07:00
Ben Roberts
705c7ad09d added tests and fix for unpickleable metadata in SortedDictWithMetadata 2012-12-05 17:43:47 -07:00
Tom Christie
56bb4a5b03 Merge pull request #448 from mhsparks/master 
Add setter to user property on request object
 2012-12-02 06:59:27 -08:00
Pavel Savchenko
1c1bd3fc5d fix test response 2012-11-30 01:37:21 +02:00
Pavel Savchenko
e311b763e1 add traverse_related feature + tests (fixes issue#461) 2012-11-30 01:34:46 +02:00
Pavel Savchenko
1b9d0eefba fix forgotten 400 test 2012-11-29 09:35:22 +02:00
Pavel Savchenko
19f67bd578 also update test with response code 401 2012-11-28 23:05:33 +02:00
Marko Tibold
e7666014a8 Added an assertion to the tests that checks the '.errors' value for the unique-test 2012-11-26 23:39:49 +01:00
Mark Hughes
85a921c7ef Added setter to user property 2012-11-24 17:18:32 +00:00
Marko Tibold
3f47f6cea9 Added a validate_unique test. 2012-11-22 23:50:42 +01:00
Marko Tibold
ca5b99486d Added _post_clean() behaviour by adding a .perform_model_validation() method. 
Fixed some tests that were failing due to extra strict validation.
 2012-11-22 22:36:37 +01:00
Mark Aaron Shirley
0876bed963 Merge remote-tracking branch 'upstream/master' into partial-update 2012-11-21 09:37:22 -08:00
Stephan Groß
03100168ff added missing line 2012-11-21 11:57:00 +01:00
Stephan Groß
6ba4df8a27 Merge remote-tracking branch 'upstream/master' into regex_field 
Conflicts:
	docs/topics/release-notes.md
 2012-11-21 11:56:34 +01:00
Stephan Groß
ed713d0354 added tests 2012-11-21 11:07:08 +01:00
Tom Christie
8e8b23b6a9 Merge pull request #430 from j4mie/serializer-method-field 
Serializer method field
 2012-11-20 15:30:30 -08:00
Mark Aaron Shirley
c3644234cd Add support for partial serializer updates 2012-11-20 11:01:21 -08:00
Jamie Matthews
3cc5349b2f Clean up and clarify tests for related serializers 2012-11-20 09:49:54 +00:00
Jamie Matthews
68c397371c Fix related serializers with source argument that resolves to a callable 2012-11-20 09:41:36 +00:00
Tom Christie
b9e5c9484a Merge pull request #399 from robromano/master 
Added login view for users of TokenAuthentication
 2012-11-19 13:30:49 -08:00
Jamie Matthews
de5b071d67 Add SerializerMethodField 2012-11-19 17:22:17 +00:00
Robert Romano
f5f1ac49ec Update robromano fork with upstream master 
Conflicts:
	docs/topics/credits.md
	docs/topics/release-notes.md
 2012-11-18 21:07:44 -08:00
Jacob Magnusson
d67ee708e5 Add support for min_length / max_length keywords 
on basic ModelFields
 2012-11-18 18:14:21 +01:00
Tom Christie
e801e21210 Merge pull request #422 from markotibold/max_length_for_modelserializers 
Max length for modelserializers
 2012-11-16 14:54:16 -08:00
Tom Christie
e40000c834 Merge pull request #408 from markotibold/file_and_image_fields 
Added a FileField and an ImageField
 2012-11-16 14:48:42 -08:00
Tom Christie
31f01bd631 Polishing to page size query parameters & more docs 2012-11-16 22:45:57 +00:00
Tom Christie
9973cf329a Merge pull request #412 from minddust/custom_page_size_per_request 
support for custom page size per request
 2012-11-16 13:45:27 -08:00
Marko Tibold
1a436dd6d9 Added URLField and SlugField. 
Fixed test_modelserializer_max_length_exceeded
 2012-11-16 22:43:16 +01:00
Marko Tibold
4edc801d59 Reproduces #421 2012-11-16 21:42:04 +01:00
Marko Tibold
403886b79b Merge commit '3b258d69c92e9d9293f7c5d1690f0ca434e677e3' into file_and_image_fields 2012-11-15 22:48:22 +01:00
Stephan Groß
a701a21587 added page_size_kwarg tests 2012-11-15 14:35:34 +01:00
Marko Tibold
69a01d7125 Added a test for the FileField. 2012-11-14 23:04:46 +01:00
Rob Romano
321ba156ca Renamed AuthTokenView to ObtainAuthToken, added obtain_auth_token var, updated tests & docs. Left authtoken.urls in place as example. 2012-11-14 12:51:00 -08:00