encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-10-30 23:47:53 +03:00
Code Issues Packages Projects Releases Wiki Activity
2,671 Commits 16 Branches 134 Tags 128 MiB
cc39b9c925
Commit Graph

2671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Christie
cc39b9c925 Merge pull request #858 from minddust/fix_710 
Fix for #710
 2013-05-18 07:19:52 -07:00
Tom Christie
3ba43b960e Added @andymckay for refactoring #860 2013-05-18 16:19:05 +02:00
Tom Christie
e32a6e4211 Merge pull request #860 from andymckay/master 
startswith can take a tuple
 2013-05-18 07:17:13 -07:00
Tom Christie
a2e2b0abda Merge pull request #857 from pyriku/675-empty-label-related-field 
Display an empty label into related fields if it isn't required
 2013-05-18 07:16:12 -07:00
Pablo Recio
7dca0e6859 Removed unicode literals 2013-05-18 16:12:48 +02:00
Pablo Recio
50ba26822d Merge branch 'master' into 675-empty-label-related-field 2013-05-18 16:11:06 +02:00
Andy McKay
aeba5bed05 startswith can take a tuple 2013-05-18 07:09:24 -07:00
Stephan Groß
b7176065a9 Update getattr 2013-05-18 16:06:30 +02:00
Tom Christie
ea9a3d88bc Merge pull request #859 from craigds/master 
fix for #765
 2013-05-18 07:06:21 -07:00
Tom Christie
80a2600891 Styling tweaks 2013-05-18 14:55:48 +01:00
Tom Christie
794413734f Merge branch 'master' of https://github.com/mmcardle/django-rest-framework into styling-fixes 2013-05-18 14:50:49 +01:00
Stephan Groß
eb9fdd04fc Remove unused var 2013-05-18 15:50:12 +02:00
Tom Christie
2e8ff4473b Tweak docs 2013-05-18 14:47:39 +01:00
Tom Christie
c8dc5b691b Merge pull request #856 from grimborg/http_debug_error_page_doc 
added comment about error behavior with DEBUG=True
 2013-05-18 06:45:59 -07:00
Tom Christie
304c07681d Merge 2013-05-18 14:45:06 +01:00
Craig de Stigter
208bd991da when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765 2013-05-18 15:23:43 +02:00
Stephan Groß
a71acc76d8 Fix for #710 2013-05-18 15:12:54 +02:00
Tom Christie
275bfa2320 Added @grimborg and @ryankask. Go Team. :) 2013-05-18 14:03:08 +01:00
Pablo Recio
392c8556ae Display an empty label into related fields if it isn't required 2013-05-18 15:01:58 +02:00
Oscar Vilaplana
4dbf2d907f added comment about error behavior with DEBUG=True 2013-05-18 14:55:55 +02:00
Mark McArdle
72bc5a3556 documentation for https://github.com/tomchristie/django-rest-framework/issues/775 2013-05-18 13:19:13 +01:00
Mark McArdle
50a8f114fc Merge branch 'master' of git://github.com/tomchristie/django-rest-framework 2013-05-18 13:12:30 +01:00
Mark McArdle
611919aa0a Initial commit of fix for https://github.com/tomchristie/django-rest-framework/issues/775 2013-05-18 13:10:05 +01:00
Tom Christie
a0e3c44c99 Added @craigds, @pyriku, @brianz - Yay for sprints! 2013-05-18 13:40:20 +02:00
Tom Christie
6d425aa3be Merge pull request #831 from brianz/master 
Allow nested fields to be missing
 2013-05-18 04:36:00 -07:00
Tom Christie
0c95405ea7 Merge pull request #853 from pyriku/725-blank-choice-dash 
Adds BLANK_CHOICE_DASH as a choice item
 2013-05-18 04:24:16 -07:00
Pablo Recio
8fe43236a2 Moved test model into closer to the testcase 2013-05-18 13:23:38 +02:00
Pablo Recio
53a8004401 Merge branch 'master' into 725-blank-choice-dash 
Conflicts:
	rest_framework/tests/fields.py
 2013-05-18 12:51:40 +02:00
Pablo Recio
ab8bd566f9 Adding BLANK_CHOICE_DASH as a choice if the model's field isn't required 2013-05-18 12:41:52 +02:00
Tom Christie
2a3056d038 Merge pull request #851 from linovia/master 
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
 2013-05-18 03:40:38 -07:00
Pablo Recio
de5cc8de42 A model's field is required if is null or blank 2013-05-18 12:40:25 +02:00
Tom Christie
9fe6a103ec Merge pull request #694 from craigds/master 
fix function names and dotted lookups for use in PrimaryKeyRelatedField
 2013-05-18 03:38:36 -07:00
Craig de Stigter
c992b600f7 add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694 2013-05-18 12:32:48 +02:00
Tom Christie
a73c16b85f serializers.Field respects ordering on dicts if it exists. Closes #832 2013-05-18 11:27:48 +01:00
Craig de Stigter
930bd4d0e1 add tests for related field source for HyperlinkedRelatedField. #694 2013-05-18 12:23:12 +02:00
Craig de Stigter
0cd7c80e6e add tests for related field source for RelatedField and PrimaryKeyRelatedField. #694 2013-05-18 12:16:30 +02:00
Xavier Ordoquy
ed0bd195f5 Updated the dependencies version and added the ALLOWED_HOSTS for tests. 2013-05-18 12:07:44 +02:00
Tom Christie
b950b025bc Merge pull request #850 from tomchristie/dynamic-forms 
Forms in Broseable API support dynamic serializers based on request method
 2013-05-18 01:49:38 -07:00
Tom Christie
aea040161a Forms in Broseable API support dynamic serializers based on request method 2013-05-18 09:36:09 +01:00
Craig de Stigter
c56d5f8f63 Merge remote-tracking branch 'upstream/master' 2013-05-18 10:23:26 +02:00
Tom Christie
34776da924 Minor mixin refactoring 2013-05-17 22:09:23 +01:00
Tom Christie
b6fb377c2b Fix PendingDeprecation warnings in tests 2013-05-17 21:57:11 +01:00
Tom Christie
14ded26167 PendingDeprecation warning to allow_empty 2013-05-17 21:28:33 +01:00
Tom Christie
2dd48fbb05 Merge pull request #847 from johtso/patch-1 
Fix typo + grammar in viewsets docs
 2013-05-17 07:08:58 -07:00
Johannes
df11198c6c Fix typo + grammar in viewsets docs 2013-05-17 12:27:48 +02:00
Michael Elovskikh
646b3b266d Updated README.md 2013-05-16 22:32:32 -07:00
Tom Christie
f1fb434e6d Update release-notes.md 2013-05-16 19:59:33 +02:00
Tom Christie
bc3dfca5e3 Added @rouge8 for bugfix #844. Thank you! 2013-05-16 19:58:17 +02:00
Tom Christie
4ade7fb82c Merge pull request #844 from rouge8/hyperlinkedidentityfield-lookup_field 
HyperlinkedIdentityField uses `lookup_field` kwarg.
 2013-05-16 10:56:12 -07:00
Andy Freeland
abe207b869 HyperlinkedIdentityField uses lookup_field kwarg. 
According to the [Serializers API Guide][1], `HyperlinkedIdentityField`
takes `lookup_field` as a kwarg like the other related fields and the
generic views. However, this was not actually implemented.

[1]: http://django-rest-framework.org/api-guide/serializers.html#hyperlinkedmodelserializer
 2013-05-16 11:48:35 -04:00