encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-14 05:36:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
5,868 Commits 18 Branches 132 Tags 104 MiB
a428d76ada
Commit Graph

1918 Commits

Author SHA1 Message Date
Mateusz Sikora
e51dc1855c Update authentication.md 2015-02-25 18:51:20 +01:00
Mateusz Sikora
71619a02c5 Update third-party-resources.md 2015-02-25 17:58:54 +01:00
ludbek
f29b657798 updated outdated link at testing.md#APIClient 2015-02-21 07:52:56 +05:45
aRkadeFR
c0916c2859 Documentation test fix double word 2015-02-20 15:59:10 +01:00
Paul Hallett
d9c652813d add missing import in tests 2015-02-18 15:53:57 +00:00
Yannick PÉROUX
30e6f32f6f Fix typo in requests.md 2015-02-17 17:08:30 +01:00
Tom Christie
f1e517449a Minor docs tweak 2015-02-17 13:41:59 +00:00
Tom Christie
691ae5b646 Recommend 'pip list --outdated' instead of using pip-review 2015-02-17 13:40:59 +00:00
Tom Christie
028c477c22 Note on using pip-review in docs. 2015-02-17 12:56:19 +00:00
Tom Christie
4248a8d3fc Merge pull request #2198 from tomchristie/version-3.1 
Version 3.1
 2015-02-13 13:38:44 +00:00
Tymur Maryokhin
9d80335ac8 Remove '.model' shortcut from viewset docs. Refs #2486. Closes #2549. 2015-02-12 01:10:03 +01:00
Xavier Ordoquy
f6033cee87 Add release notes for 3.0.5. 2015-02-10 22:46:54 +01:00
donewell
9ea615af14 add message to custom permission 
change detail to message and update text
 2015-02-10 20:11:53 +00:00
Joar Leth
b18d773b51 Fix typo in 3.1 announcement 2015-02-09 22:51:49 +01:00
Tom Christie
fbb21caaaa Merge master 2015-02-09 20:43:50 +00:00
Tom Christie
407480b484 Minor docs work 2015-02-09 17:01:41 +00:00
Tom Christie
670723f021 Minor cleanups/improvements to ModelSerializer API 2015-02-06 15:45:02 +00:00
José Padilla
235b98e427 Merge pull request #2460 from mmarvick/master 
Small fixes to the tutorial
 2015-02-06 11:31:25 -04:00
Tom Christie
5d8c3abe72 Fix typo 2015-02-06 15:27:35 +00:00
Tom Christie
a435b1b355 Merge branch 'version-3.1' of git://github.com/jpadilla/django-rest-framework into version-3.1 2015-02-06 14:39:31 +00:00
Tom Christie
1f99612845 Upgrade pending deprecations to deprecations 2015-02-06 13:21:35 +00:00
Tom Christie
1d4956f616 Pagination images 2015-02-06 13:08:04 +00:00
Tom Christie
53716f6152 Internationalization docs 2015-02-06 11:37:29 +00:00
José Padilla
7f801b9a01 Add trim_whitespace to CharField #2517 
If set to `True` then leading and trailing
whitespace is trimmed. Defaults to `True`.
 2015-02-06 01:09:19 -04:00
Michael Marvick
5bf803b6ed Revert some of the changes made in 1-serialization.md 2015-02-05 19:42:36 -08:00
Tom Christie
09488ad4da Link to ModelSerializer API 2015-02-06 00:25:03 +00:00
Tom Christie
6c63ef13cd Drop 2.x announcements 2015-02-06 00:04:20 +00:00
Tom Christie
41b213414d Updating release notes 2015-02-04 23:32:25 +00:00
Xavier Ordoquy
46181341d5 Merge pull request #2512 from heywbj/docs 
Add django-rest-framework-recursive to docs
 2015-02-04 00:13:52 +01:00
Warren Jin
76efbdddb6 docs 2015-02-03 17:18:54 -05:00
James Cooke
f676569661 Small documentation fixes 
* Remove "you you" from viewsets API-guide
* Fix link from routers API-guide to viewsets API-guide
 2015-02-03 13:43:03 +00:00
Tom Christie
d015534d53 Fleshing out 3.1 announcement 2015-02-03 09:15:42 +00:00
Tom Christie
6e2ea852d0 Merge pull request #2498 from dustinfarris/update-eda-link 
Update link for ember-django-adapter
 2015-02-01 21:17:36 +00:00
Dustin Farris
2111a99b32 Update link for ember-django-adapter 2015-02-01 16:00:24 -05:00
José Padilla
9437d9b8ee Fix base_template name in example 2015-02-01 16:18:40 -04:00
José Padilla
aaa1fcd5d1 Fixes #2493 2015-02-01 16:18:02 -04:00
Tom Christie
2cc4cb2465 Fix error text in test. 2015-01-31 08:53:40 +00:00
Tom Christie
0d96cf2ca2 Latest translation source messages. 2015-01-30 16:27:49 +00:00
Tom Christie
4ee4b4f2dc Merge master 2015-01-30 14:00:25 +00:00
Tom Christie
7cf9dea7f9 Docs typo. Closes #2491. 2015-01-30 11:00:29 +00:00
Tymur Maryokhin
e720927b78 Removed deprecated '.model' docs 2015-01-29 17:28:18 +01:00
mareknaskret
4a2a36ef82 Update filtering.md 
Updated links for django-guardian package.
 2015-01-28 15:17:56 +01:00
Xavier Ordoquy
0daf160946 Fix #2476 2015-01-28 00:06:34 +01:00
Xavier Ordoquy
925ea4bdc6 Release notes for 3.0.4 2015-01-27 19:43:38 +01:00
Tom Christie
fc70c0862f Galileo Press -> Rheinwerk Verlag 2015-01-26 14:07:21 +00:00
Michael Marvick
73bd0d539f tutorial #5 incorrectly referenced 'settings.py' instead of 'tutorial/settings.py' 2015-01-25 23:47:01 -08:00
Michael Marvick
2a6937f381 tutorial #2 incorrectly showed /item.json instead of /item/.json for format suffixes 2015-01-25 23:46:27 -08:00
Michael Marvick
90c9968a70 tutorial #1 incorrectly showed string of json instead of ReturnDict type from 'serializer.data', and also has a third item in the second usage 2015-01-25 23:45:56 -08:00
Jeff Fein-Worton
0a65913fea typo in fields.md 2015-01-24 18:34:16 -08:00
Jeff Fein-Worton
39da9c7c86 minor typo in viewsets docs 2015-01-24 12:53:21 -08:00
Tom Christie
8f6d7f4a5a Merge pull request #2451 from tomchristie/dict-field 
Added DictField and support for HStoreField.
 2015-01-23 16:33:37 +00:00
Tom Christie
35f6a82462 Added DictField and support for HStoreField. 2015-01-23 16:27:23 +00:00
Tom Christie
b07d931261 Merge pull request #2448 from tomchristie/uuid-field 
Added UUIDField.
 2015-01-23 15:43:21 +00:00
Tom Christie
5bb348605e UUIDField docs 2015-01-23 15:31:08 +00:00
Tom Christie
39f26c9eca Merge master 2015-01-23 14:28:59 +00:00
Carlton Gibson
790c92d438 Update Django-Filter references in docs and requirements. 2015-01-23 15:22:20 +01:00
Duncan Maitland
6e471ad8f4 fix link to Django CSRF docs 2015-01-22 18:29:20 +11:00
Tom Christie
9ec08ce578 Merge master 2015-01-21 13:12:14 +00:00
soooooot
3ca8f85a5b correcting unclosed quote in routers.md 
correcting unclosed quote in routers.md
 2015-01-20 22:24:58 +08:00
Eric Theise
b0bc79ed4d correcting "it's" to "its" in Tutorial 1 2015-01-19 14:49:36 -08:00
Tom Christie
6065cdbd93 Merge master 2015-01-19 15:16:57 +00:00
Tom Christie
53edd37df5 Tests for LimitOffsetPagination 2015-01-15 21:07:05 +00:00
Tom Christie
313aa727e3 Tweaks 2015-01-14 17:46:41 +00:00
Tom Christie
1bcec3a0ac API tweaks and pagination documentation 2015-01-13 17:14:13 +00:00
Tom Christie
564f845e21 Lower header font weights for nicer docs style 2015-01-13 12:21:03 +00:00
Tom Christie
8e2dc6b26d Update internationalization docs 2015-01-13 12:07:25 +00:00
Tom Christie
2b28026fc1 Translation info -> project management 2015-01-13 10:44:40 +00:00
Carlton Gibson
41e13d73fa Merge pull request #2407 from philipn/filters_link_fix 
Fix link to `django-rest-framework-filters`
 2015-01-13 09:04:33 +01:00
Philip Neustrom
7f9a62a5bf Fix link to django-rest-framework-filters (formerly 
`django-rest-framework-chain`)
 2015-01-13 15:22:08 +08:00
Tom Christie
605c1fa0a8 Merge pull request #2397 from travelton/TweakTutorialDocs 
Tweaked a few issues in the tutorial documentation.
 2015-01-10 14:07:13 +00:00
Travis Swientek
8ccf5bcc0b Tweaked a few issues in the tutorial documentation. 2015-01-09 11:36:21 -08:00
Tom Christie
11efde8905 Merge pull request #2373 from jakul/document-translations-3.1 
Document how to translate DRF error messages (version 3.1)
 2015-01-09 11:57:02 +00:00
Xavier Ordoquy
ef16c546d7 Update the release note with latest fixes. 
Add the link to the 3.0.3 milestone.
 2015-01-08 23:29:51 +01:00
Xavier Ordoquy
02ee3871ae Merge remote-tracking branch 'origin/master' into release/3.0.3 2015-01-08 23:24:19 +01:00
Tom Christie
42c913334b Minimum 1.6.x version is 1.6.3 2015-01-08 14:51:08 +00:00
Tom Christie
f529f83d3c Minimum Django 1.5 version issue 1.5.6 2015-01-08 14:38:23 +00:00
Tom Christie
f0ad0a88c4 Link to Roy Fielding versioning interview. 2015-01-08 12:31:51 +00:00
Tom Christie
3dbcefb3c7 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2015-01-08 11:07:52 +00:00
Tom Christie
e61ef3d39f Minor docs updates 2015-01-08 11:07:47 +00:00
Tom Christie
18cefad3ab Update project-management.md 2015-01-07 21:03:50 +00:00
Tom Christie
1102e22cb4 Update project-management.md 2015-01-07 21:02:42 +00:00
Xavier Ordoquy
42f1932b52 Release notes for 3.0.3 2015-01-07 19:10:22 +01:00
Craig Blaszczyk
7913947757 add config and documentation about uploading/downloading translations from Transifex 2015-01-07 11:13:03 +00:00
JocelynDelalande
fe92a2cfee fixed doc : DEFAULT_AUTHENTICATION_CLASSES -> DEFAULT_AUTHENTICATION 
+ It is consistent with docs about DEFAULT_PERMISSION_CLASSES
 2015-01-07 10:42:11 +01:00
Tom Christie
271b638df1 Update exception docs. Closes #2378. 2015-01-06 11:21:58 +00:00
Tom Christie
d3b2302588 Minor docs update. Refs #2375. 2015-01-05 16:31:52 +00:00
Tom Christie
949e3b7507 Merge branch 'master' into version-3.1 2015-01-05 15:04:23 +00:00
Tom Christie
b6ca7248eb required=False allows omission of value for output. Closes #2342 2015-01-05 14:32:12 +00:00
Tom Christie
17665aa52a Add docs for OAuth, XML, YAML, JSONP packages. Closes #2179. 2015-01-05 12:26:15 +00:00
Tom Christie
6168f60ba8 Merge branch 'master' into version-3.1 2015-01-05 11:02:28 +00:00
Craig Blaszczyk
9f169acb62 capitalise Django 2015-01-02 11:08:45 +00:00
Craig Blaszczyk
0b8a83bd62 update internationalisation instructions to prevent symlinking; add base .po file 2015-01-02 11:08:04 +00:00
Craig Blaszczyk
2781903a5a Add info about how django chooses which language to use 2015-01-02 11:07:58 +00:00
Craig Blaszczyk
7ad7dd6a42 match DRF style guide 2015-01-02 11:07:49 +00:00
Craig Blaszczyk
309b5d2641 instructions on how to translate REST framework error messages 2015-01-02 11:07:35 +00:00
Rob Terhaar
336faf5a86 fix widget style formatting 2015-01-01 21:01:16 -05:00
Tom Christie
5d8c45681a Update copryright for 2015. Closes #2247. 2014-12-28 18:48:42 +00:00
Tom Christie
d8e66970a1 Note on using i18n_patterns with format_suffix_patterns. Closes #2278. 2014-12-28 12:14:07 +00:00
Tom Christie
8dc95ee221 Add notes on include and namespacing. Closes #2335. 2014-12-28 11:24:49 +00:00
Tom Christie
27f84aa0f3 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-28 11:02:36 +00:00
Tom Christie
a636320ff3 Add import notes in docs. Closes #2357 2014-12-28 11:02:19 +00:00
Rocky Meza
5b5652594a Typo manger => manager 2014-12-26 22:24:31 -07:00
Tom Christie
00531ec937 Release notes on non-text detail arguments. Closes #2341. 2014-12-26 15:48:16 +00:00
Matías Lang
18687f075d Documented an optional argument of HyperlinkedIdentityField 
lookup_url_kwarg argument of HyperlinkedIdentityField wasn't documented
 2014-12-23 12:22:10 -03:00
Brian Stearns
3569674860 use of double quotes broke the code highlighting. 2014-12-21 18:53:35 -05:00
Tom Christie
2a1485e009 Final bits of docs for ModelSerializer fields API 2014-12-19 21:32:43 +00:00
Tom Christie
48d15f6ff8 Stub out the documentation 2014-12-19 16:58:35 +00:00
Tom Christie
d109ae0a2e Merge pull request #2010 from tanwanirahul/master 
Ability to customize method names without creating a custom router
 2014-12-19 16:09:01 +00:00
Rahul
8f0fef4b75 Updated documentation on url_path per suggestions. 2014-12-19 21:22:10 +05:30
Rahul
b4a3e7f640 Updates url_path info per suggestion 2014-12-19 21:20:19 +05:30
Rahul
6aa0e307c9 Added documentation about url_path parameter for custom actions. 2014-12-19 20:31:21 +05:30
tanwanirahul
a8a3fedb5c Add url_path documention for detail_route decorator 2014-12-19 20:16:46 +05:30
Tom Christie
435aef7738 Merge branch 'master' into version-3.1 2014-12-19 11:53:05 +00:00
Tom Christie
7105c1308e Add OPTIONS/metadata to docs index 2014-12-18 15:42:27 +00:00
Tom Christie
9c9d5bd859 Added project management docs. 2014-12-18 13:35:42 +00:00
Tom Christie
c8d88c8c8a Merge branch 'master' into version-3.1 2014-12-18 11:21:25 +00:00
Brent O'Connor
7e9aac98fe The pre_save method no longer works. This resolved issue #2306 2014-12-17 16:54:04 -06:00
Tom Christie
c87e95c239 Add missing date 2014-12-17 21:11:06 +00:00
Tom Christie
15c2001de0 Merge pull request #2297 from tomchristie/version-3.0.2 
Version 3.0.2
 2014-12-17 21:04:08 +00:00
Brent O'Connor
4f33cfe1a0 With httpie 0.8.0 the HTTP method has to come after the auth argument. 2014-12-17 14:38:01 -06:00
Tymur Maryokhin
eeb6e34064 Docs/tutorial import fixes. Refs #2296 2014-12-17 17:28:11 +01:00
Tom Christie
418108632c Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-17 16:23:20 +00:00
Tom Christie
90b8f9221e Use six.BytesIO in tutorial. Closes #2296. 2014-12-17 16:23:00 +00:00
Tom Christie
5f933f575e Merge pull request #2298 from epicserve/fix_typo 
Fixed a typo
 2014-12-17 16:20:22 +00:00
Brent O'Connor
530f7a21b3 Fixed a typo 2014-12-17 10:19:15 -06: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
2adfb6c3aa Cleanup extra newline 2014-12-17 16:00:49 +00:00
Tom Christie
bbd55fafc5 Version 3.0.2 2014-12-17 15:58:30 +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
ffc099a256 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-17 15:22:40 +00:00
Tom Christie
1ba822010d Highlight trailing '.' in command so it wont be missed. 2014-12-17 15:22:27 +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
Jason Spafford
b951c74df2 Made docs consistent 2014-12-15 01:24:12 -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
73a80564e2 Merge pull request #2251 from linovia/version/3.0.1 
Release notes & version 3.0.1
 2014-12-11 15:08:07 +00:00
Xavier Ordoquy
9c37174768 Fix the ghost backtick. 2014-12-11 15:58:02 +01:00
Xavier Ordoquy
3a69182cc9 Better link representation for the issues. 2014-12-11 15:32:52 +01:00
Xavier Ordoquy
75acdc93bc Fix the milestone link again. 2014-12-11 15:13:15 +01:00
Xavier Ordoquy
99423defd8 Add full stop to the release note items. 
Add link to the issues
Fix the milestone link
 2014-12-11 15:11:37 +01:00
Xavier Ordoquy
9a7b0755eb Add links to the issue id. 2014-12-11 15:06:10 +01:00
Xavier Ordoquy
ab801bb01f Release note corrections 2014-12-11 14:57:26 +01:00
Tom Christie
9b88b5db69 Field->ReadOnlyField in tutorial docs 2014-12-11 09:54:55 +00:00
Xavier Ordoquy
0188ca7306 Release notes for 3.0.1 2014-12-11 00:02:13 +01:00
Tom Christie
8ad0b83148 Minor docs tweaks 2014-12-10 14:29:21 +00:00
Tom Christie
01bb85e80a Merge pull request #2246 from d0ugal/mkdocs-theme 
Syntax highlighting
 2014-12-10 14:22:00 +00:00
Dougal Matthews
5fe5a93644 Move remaining sponsor 2014-12-10 14:09:47 +00:00
Dougal Matthews
1ea84c92a7 Sorted the images 
Moved images referenced by the markdown back to the docs directory
Deleted unused image autocomplete.png
 2014-12-10 13:59:51 +00:00
Tom Christie
dafc5d45a0 Minor docs tweaks to titles and citations 2014-12-10 12:28:48 +00:00
Dougal Matthews
9883862576 Move the static content into the docs theme 2014-12-10 11:34:26 +00:00
Tom Christie
76956beab4 snippets relationship in tutorial should be read_only 2014-12-09 19:53:27 +00:00
Tom Christie
f5b783af61 allow_blank in ChoiceField. Refs #2239. 2014-12-09 14:21:31 +00:00
Tom Christie
cae19f8924 Minor docs tweaks 2014-12-09 13:21:10 +00:00
Tom Christie
4cdfb6adc2 Add REST framework: Under the hood. video to the 3.0 announcement. 2014-12-09 13:18:18 +00:00
Tom Christie
af3fe5a39f Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-08 16:38:29 +00:00
Tom Christie
4e9ebb5fe9 cd back to parent directory 2014-12-08 16:38:17 +00:00
Tom Christie
302ec59a5c Merge pull request #2165 from phalt/httpie-examples 
Use httpie for tutorials
 2014-12-08 15:51:19 +00:00
phalt
f3ebac061e one last tabs / spaces! 2014-12-08 15:47:49 +00:00
phalt
8e9408115d fixed indentations 2014-12-08 15:41:01 +00:00
Tom Christie
fd02d8266b Added 3.0 to release notes. 2014-12-08 15:16:33 +00:00
José Padilla
8ba4e7bafe Add misc note about localization 2014-12-08 09:18:37 -04: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
Xavier Ordoquy
e4820d611b Fix the new Django default db name 
PrimaryKeyRelatedField now needs a queryset argument.
urls now don't use urlpatterns.
 2014-12-06 10:58:17 +01: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
Tom Christie
b7b0fd3e14 Added .validated_data usage. Closes #2214. 2014-12-05 12:48:12 +00:00
Tom Christie
1b8c06aefe Style tweaks in examples 2014-12-05 12:46:08 +00:00
Tom Christie
e2b3908834 Fix quickstart tutorial 2014-12-05 09:44:01 +00:00
Xavier Ordoquy
9d078be59c Fix the tutorial against the v3.0 2014-12-04 23:34:55 +01:00
Xavier Ordoquy
38e05e66c9 print() function works from Python 2.6 to 3.X 2014-12-04 23:22:00 +01:00
Carlton Gibson
6ee361332b Add missing definite article 2014-12-04 14:15:01 +01:00
phalt
fcbae5d99f updates based on suggestions 2014-12-04 11:20:33 +00: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
Martin Tschammer
ab25d706c7 Renamed validated_attrs to validated_data to be more in line with other similar code. 2014-12-03 23:52:35 +01:00
eiriksm
74a9ece3dc Update build status icon on github pages page. 2014-12-03 13:37:56 +01:00
phalt
a17d5d2b0b remove unsused link 2014-12-02 16:11:43 +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
phalt
515060a6ab Only show pip install for httpie 2014-12-02 10:16:41 +00: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
deec61e0d6 Merge pull request #2173 from jpadilla/master 
Consolidate Django and test requirements
 2014-12-02 08:32:28 +00:00
Tymur Maryokhin
0a91999d6a Merge branch 'master' of github.com:tomchristie/django-rest-framework 2014-12-02 01:50:17 +01:00
José Padilla
bc0c25df30 Consolidate Django and test requirements 2014-12-01 17:31:11 -04:00
José Padilla
080fa4f5f8 Change allow_none to allow_null 2014-12-01 11:26:50 -04:00