Commit Graph

4770 Commits

Author SHA1 Message Date
Dougal Matthews
dbc5c066c2 Add a theme.js file to enable highlighing 2014-12-10 11:34:26 +00:00
Dougal Matthews
9883862576 Move the static content into the docs theme 2014-12-10 11:34:26 +00:00
Tom Christie
fb313f8098 Merge pull request #2241 from IvanAlegre/patch-1
Update serializers.py
2014-12-10 09:27:58 +00:00
Tom Christie
81d0b748b4 Improve field lookup behavior for dicts/mappings. Closes #2244. Closes #2243. 2014-12-10 09:16:01 +00:00
J. Iván Alegre
428630c197 Fix trailing space 2014-12-10 10:13:15 +01:00
J. Iván Alegre
9161e5a927 Remove unnecessary hasattr all and add comment for nested relationships 2014-12-10 09:19:27 +01:00
Tom Christie
76956beab4 snippets relationship in tutorial should be read_only 2014-12-09 19:53:27 +00:00
J. Iván Alegre
59470667db Take in care that input data in serializer can be a Manager 2014-12-09 17:49:07 +01:00
Tom Christie
7d70e56ce3 Copy model field validators, don't reuse the same list. 2014-12-09 16:25:10 +00:00
Tom Christie
8933bc4b14 Merge branch 'validator-pollution' of git://github.com/mhsparks/django-rest-framework into mhsparks-validator-pollution 2014-12-09 16:23:33 +00:00
Julio Iván Alegre
8d6b0b1f2d Update serializers.py
Treat the input queryset as it comes (maybe it has been changed in a higher level). Evaluating .all() does nothing if or if not is a queryset.
2014-12-09 16:13:18 +01:00
Tom Christie
f5b783af61 allow_blank in ChoiceField. Refs #2239. 2014-12-09 14:21:31 +00:00
Tom Christie
54a18a4ddb Merge pull request #2239 from jpadilla/allow-blank-choicefield
Add allow_blank for ChoiceField #2184
2014-12-09 14:08:45 +00:00
José Padilla
afe7ed9333 Add allow_blank for ChoiceField #2184
This makes a ChoiceField optional in HTML if
model field has `blank=True` set.
2014-12-09 09:25:06 -04:00
Tom Christie
cae19f8924 Minor docs tweaks 2014-12-09 13:21:10 +00:00
Tom Christie
a9454013f1 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-12-09 13:18:31 +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
0f080bc293 Update README.md 2014-12-09 10:06:23 +00:00
Tom Christie
41bfdc0732 Don't use 'instance' argument in rendering form for paginated data. Closes #2205. 2014-12-08 21:56:06 +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
Tom Christie
4034793383 Added missing translation markers in realtions.py. Closes #2231. 2014-12-08 15:13:59 +00:00
Tom Christie
62cca1eec7 Merge pull request #2232 from tomchristie/validate-in-list-serializer
Added ListSerializer.validate().
2014-12-08 15:02:53 +00:00
Tom Christie
eee02a47d9 Added ListSerializer.validate(). Closes #2168. 2014-12-08 14:56:45 +00:00
Tom Christie
ef89c15663 Merge pull request #2229 from jpadilla/localization-note
Add misc note about localization
2014-12-08 13:46:38 +00:00
José Padilla
8ba4e7bafe Add misc note about localization 2014-12-08 09:18:37 -04:00
Tom Christie
b440bd74be Merge pull request #2187 from loic/cosmetic_fixes
Cosmetic fixes in the API browser HTML.
2014-12-08 09:07:57 +00:00
Victor Cabral
0c0d65d232 Fixed unit test for auth login 2014-12-08 09:06:52 +07:00
Loic Bistuer
b90f4228b2 Ported a couple of templates to Bootstrap 3.x. 2014-12-08 09:06:52 +07:00
Loic Bistuer
ff02a0af9c Fixed display issues with tooltips. 2014-12-08 09:06:52 +07:00
Tom Christie
9879a5dcdc Merge pull request #2226 from mhenwood/amend_viewset_docs
Amend ViewSet docs to warn of potential problem
2014-12-07 14:29:05 +00:00
Tom Christie
8553858e73 Merge pull request #2224 from linovia/bugfix/2221
Fix missing validated_data in `raise_errors_on_nested_writes` (#2221)
2014-12-07 14:00:41 +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
Xavier Ordoquy
a257b04928 Fix missing validated_data in raise_errors_on_nested_writes (#2221) 2014-12-07 12:12:40 +01:00
Tom Christie
71c49fea8a Merge pull request #2219 from linovia/bugfix/tutorial_2
Update the tutorial against DRF v3 (part 4 & 5)
2014-12-06 10:14:16 +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
544967f36e Test tweaks 2014-12-05 14:15:58 +00:00
Tom Christie
c611a2c1fe Merge pull request #2213 from BrickXu/master
Raise error if `fields` on serializer is not a list of strings.
2014-12-05 14:00:59 +00:00
Tom Christie
fca9175029 Merge pull request #2215 from tomchristie/tomchristie-better-serializer-errors
Better serializer errors for nested writes.
2014-12-05 13:59:38 +00:00
Tom Christie
88900a0844 Minor tweaks 2014-12-05 13:58:39 +00:00
Tom Christie
ca74fa989d Better serializer errors for nested writes. Closes #2202 2014-12-05 13:50:28 +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
65d6cba75f Merge pull request #2200 from maryokhin/master
Clean up compat code
2014-12-05 13:14:14 +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