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
Markus Törnqvist
764299843c
ManyHyperlinkedRelatedField comes form rest_framework.relations now
2013-05-18 13:30:39 +03:00
Tom Christie
a73c16b85f
serializers.Field respects ordering on dicts if it exists. Closes #832
2013-05-18 11:27:48 +01:00
Markus Törnqvist
3691cd2ffd
Use smart_text() instead of nonexistant smart_unicode()
2013-05-18 13:26:59 +03:00
Markus Törnqvist
85faebbb75
Merge branch 'mikee2185-master' into mjtorn-master
...
Conflicts:
rest_framework/fields.py
rest_framework/serializers.py
rest_framework/tests/models.py
rest_framework/tests/serializer.py
Fixed all the conflicts.
2013-05-18 13:24:36 +03: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
Tom Christie
0e81ffced2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-16 15:25:04 +01:00
Tom Christie
aff88d15f7
Version 2.3.3
2013-05-16 15:08:12 +01:00
Tom Christie
1a4e99e892
Merge pull request #843 from linovia/master
...
Small typo in the ViewSet example.
2013-05-16 01:12:18 -07:00
Xavier Ordoquy
66aa2f7a16
Small typo in the ViewSet example.
2013-05-16 09:47:22 +02:00
Tom Christie
af88a5b175
Test and fix which closes #652 .
2013-05-15 14:25:25 +01:00
Tom Christie
092d5223eb
Fix searchfilter issues
2013-05-15 10:29:51 +01:00
Tom Christie
2f54decd3e
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-14 21:41:39 +01:00
Tom Christie
e939e1755a
Base automatic filterset model on the queryset model. Fixes #834 .
2013-05-14 21:40:55 +01:00
Tom Christie
599c0eb0db
Added @jsummerfield for cleanups in #824 . Thanks!
2013-05-14 19:38:41 +02:00
Tom Christie
dd3c434f6c
Merge pull request #824 from jsummerfield/patch-1
...
Remove trailing unmatched </div> in login_base.html template. Reformat i...
2013-05-14 10:36:31 -07:00
Tom Christie
d62414147f
Fix assert messaging on fields/exclude checking. Closes #833
2013-05-14 17:53:37 +01:00
Tom Christie
d199a89c18
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-14 11:40:43 +01:00
Tom Christie
6487fa535b
Added @avinash240 for bugfix #822
2013-05-14 11:39:30 +01:00
Tom Christie
727a64f3b9
Updated release notes
2013-05-14 11:38:55 +01:00
Tom Christie
a303d0f38c
Fix filter test renaming
2013-05-14 11:37:59 +01:00
Tom Christie
ce1a04a603
Merge branch 'master' of https://github.com/avinash240/django-rest-framework
2013-05-14 11:34:47 +01:00
Tom Christie
2cff6e69db
Added OrderingFilter
2013-05-14 11:27:08 +01:00
Tom Christie
6a037f63ed
Added OrderingFilter
2013-05-14 11:27:03 +01:00
Tom Christie
08bc976269
Rename filter tests
2013-05-14 10:16:46 +01:00
Tom Christie
aa0dcd2e4a
More docs on SearchFilter
2013-05-14 10:16:00 +01:00
Tom Christie
b2bf5f1f88
SearchFilter may be comma and/or whitespace seperated
2013-05-14 10:10:44 +01:00
Tom Christie
752c01420f
Fix Django 1.3 compat with routers
2013-05-14 10:01:05 +01:00
Tom Christie
f9aeb68383
Updated release notes
2013-05-14 09:59:29 +01:00
