Tom Christie
c8d88c8c8a
Merge branch 'master' into version-3.1
2014-12-18 11:21:25 +00:00
Tymur Maryokhin
eeb6e34064
Docs/tutorial import fixes. Refs #2296
2014-12-17 17:28:11 +01:00
Tom Christie
265ed9377e
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2014-12-17 16:19:13 +00:00
Tom Christie
c9a2ce0703
Expand permissions docs. Closes #2223 .
2014-12-17 16:19:02 +00:00
Tom Christie
ad6533e554
Merge pull request #2294 from tomchristie/fix-empty-html-values-with-default
...
Fix empty HTML values when a default is provided.
2014-12-17 15:24:01 +00:00
Tom Christie
3fff5cb6e0
Fix empty HTML values when a default is provided.
2014-12-17 15:13:48 +00:00
Tom Christie
c6137bbf5a
Serializer API restrictions.
2014-12-17 14:14:51 +00:00
Tom Christie
05a6eaec8a
More docs, plus 'ALLOWED_VERSIONS' setting.
2014-12-17 12:41:46 +00:00
Tom Christie
6e51e4f5cd
Versioning first pass
2014-12-16 15:34:19 +00:00
José Padilla
d71ef9c6d8
Closes #2281
2014-12-15 21:48:31 -04:00
Tom Christie
b6ee784240
Merge master
2014-12-15 12:18:55 +00:00
Jason Spafford
56c09cc1f2
Doc typo
2014-12-15 02:41:39 -08:00
Tom Christie
d232c5739e
Merge branch 'exception-handler-context' of git://github.com/jpadilla/django-rest-framework into version-3.1
2014-12-15 09:19:53 +00:00
Tom Christie
4778463e32
Merge branch 'master' into version-3.1
2014-12-15 09:18:11 +00:00
José Padilla
478c8d724b
Update docs
2014-12-14 10:16:52 -04:00
Brian Jacobel
2d470eef80
Change serializers.Field to serializers.ReadOnlyField for 3.x compatibility
...
Using this code snippet as-is on DRF 3.0.1 results in a NotImplementedError
being raised for to_representation due to 3.0's changed behavior with
serializers.Field. The code snippet should be updated to use
serializers.ReadOnlyField instead.
Further discussion here:
https://groups.google.com/forum/?fromgroups=#!topic/django-rest-framework/aX8mLT_v3yc
2014-12-13 14:47:11 -05:00
Jeff Fein-Worton
00da241482
documentation typo
...
base-name -> base_name
2014-12-12 22:14:22 -08:00
Tom Christie
baaa356489
Merge master
2014-12-12 15:37:43 +00:00
Tom Christie
f5b783af61
allow_blank in ChoiceField. Refs #2239 .
2014-12-09 14:21:31 +00:00
Mark Henwood
9b468fba60
Amend ViewSet docs to warn of potential problem
...
I went through this exact problem and so thought the docs might
benefit from a small hint at the appropriate point.
2014-12-07 12:02:43 +00:00
Tom Christie
59b2ad5425
Minor docs tweaks
2014-12-05 13:23:14 +00:00
Tom Christie
e2587c7b4d
Merge pull request #2204 from carltongibson/default-docs-fix
...
Clarify read-only & `unique_together` Documentation
2014-12-05 13:20:16 +00:00
Tom Christie
9fb1b396db
user in example should have been instance. Closees #2191 .
2014-12-05 13:07:31 +00:00
Carlton Gibson
6ee361332b
Add missing definite article
2014-12-04 14:15:01 +01:00
Carlton Gibson
71e1a3942e
Initial link from Serializers to Validators
2014-12-04 12:15:14 +01:00
Tom Christie
3d6620c72a
Merge
2014-12-03 23:24:06 +00:00
Tom Christie
f74e52b31e
Merge
2014-12-03 23:14:58 +00:00
Tom Christie
6369f92125
Merge
2014-12-03 23:12:52 +00:00
Matías Lang
5ad22aea60
Updated serializers documentation
...
There was an error in the docs: the field extra_field_kwargs of the serializer's Meta doesn't work. The field must be extra_kwargs instead.
2014-12-02 12:23:25 -03:00
David Ray
84cff98fbf
fix typo
2014-12-02 09:46:43 -05:00
Tom Christie
6ac79b8223
Document Field.fail(). Closes #2147 .
2014-12-02 09:19:59 +00:00
Tom Christie
f4fc4670ca
Promote 'many_init' to public API. Closes #2152 .
2014-12-02 08:53:36 +00:00
Tom Christie
555c450497
Add missing 'validators.py' link. Closes #2166 .
2014-12-01 14:46:47 +00:00
José Padilla
7f9dc73672
Remove XML support from core
2014-11-29 14:57:51 -04:00
José Padilla
fe745b9616
Remove JSONP support from core
2014-11-29 14:55:33 -04:00
José Padilla
731c8421af
Remove YAML support from core
2014-11-29 14:43:05 -04:00
José Padilla
0cc990792c
Merge branch 'version-3.1' into oauth_as_package
...
Conflicts:
requirements-test.txt
rest_framework/compat.py
tests/settings.py
tox.ini
2014-11-28 12:14:40 -04:00
Tom Christie
08c727add3
@api_view defaults to allowing GET
2014-11-28 15:55:02 +00:00
Tom Christie
9ba29a88d6
Finalizing 3.0 release notes
2014-11-28 14:43:33 +00:00
Tom Christie
8e549a76ea
Add 2.x notes and links
2014-11-28 14:26:03 +00:00
Tom Christie
276a2a52ee
Docs on nested creates/updates and suchlike
2014-11-28 11:26:35 +00:00
Tom Christie
34ca8cd2a5
Moar docs. Amazing.
2014-11-28 09:56:44 +00:00
Tom Christie
0262262fee
3.0 serializer docs
2014-11-27 08:09:58 +00:00
Tom Christie
786cab705a
Tweak to 3.0 relationship docs
2014-11-26 11:38:48 +00:00
Tom Christie
5a5a73c7fe
3.0 docs and tidy-up for serializer relationships
2014-11-26 11:30:49 +00:00
Tom Christie
e1b14cbe4a
3.0 docs for serializer fields
2014-11-26 10:27:29 +00:00
Tom Christie
0f5338ada9
Call out removal of pre_save/post_save more strongly
2014-11-26 09:06:15 +00:00
Tom Christie
c01c631ef2
perform_create, perform_update, perform_destroy hooks
2014-11-26 09:04:48 +00:00
Tom Christie
31536566d7
Updating fields docs
2014-11-25 17:35:27 +00:00
Tom Christie
f13c0ebe69
Merge master
2014-11-25 16:27:00 +00:00