Commit Graph

7150 Commits

Author SHA1 Message Date
José Padilla
be0e196e65
Remove unused base.js script 2017-03-17 21:43:20 -04:00
José Padilla
7e76cd8695
Correctly set scheme in coreapi TokenAuthentication 2017-03-17 20:27:36 -04:00
Tom Christie
73ad88eaae Merge pull request #4993 from jeffcjohnson/master
add content block and breadcrumbs_empty block to base.html for reuse
2017-03-17 14:35:36 +00:00
Jeff Johnson
323f59091c add content block and breadcrumbs_empty block to allow base.html to be reused 2017-03-16 09:03:45 -04:00
Tom Christie
fb8cbab4cf Merge pull request #4991 from fakepoet/patch-1
Fix Django url syntax.
2017-03-16 12:26:46 +00:00
Dark Goat
3cf01b7350 Update 7-schemas-and-client-libraries.md
fix django url syntax.
2017-03-16 19:37:48 +08:00
Tom Christie
f3ccad8fea Merge pull request #4988 from ossanna16/master
Updated testimonial name on funding site
2017-03-16 09:11:00 +00:00
Xavier Ordoquy
e438c532ae Merge pull request #4985 from COCOLMAN/master
ID must start from 1 again
2017-03-16 07:18:49 +01:00
Anna
6a8aed03a8 Updated testimonial name on funding site 2017-03-16 06:00:57 +01:00
sol HYUN
eb8c658f33 ID must start from 1 again
At the beginning of tutorial4, The database had been removed
2017-03-16 06:34:30 +09:00
Tom Christie
3b466fabe7 Merge pull request #4973 from tomchristie/support-head-in-viewsets
Support HEAD in viewsets
2017-03-13 13:16:04 +00:00
Tom Christie
e94011eb77 Merge pull request #4972 from tomchristie/use-items-template-tag
Use 'items' templatetag throughout.
2017-03-13 12:53:25 +00:00
Tom Christie
43b38964ea Support HEAD in viewsets 2017-03-13 12:51:03 +00:00
Tom Christie
0173e9bd21 Use 'items' templatetag throughout. 2017-03-13 12:35:19 +00:00
Tom Christie
df2adbb423 Merge pull request #4957 from ossanna16/master
Updated funding page
2017-03-13 10:43:03 +00:00
Tom Christie
2df80c3c9d Merge pull request #4688 from theosotr/feature-source
Support usage of 'source' in `extra_kwargs`.
2017-03-13 10:25:38 +00:00
Tom Christie
d508a3dd1e Merge pull request #4967 from 0xKD/patch-2
Update coreapi.js version in JavaScript API docs.
2017-03-13 10:06:35 +00:00
Tom Christie
de9a8c4811 Fix mime type on schema.js endpoint. Closes #4968. 2017-03-13 10:03:13 +00:00
Kedar
9e62bc51ec Update coreapi.js version 2017-03-11 11:19:26 +05:30
Anna
ade7a254d5 Fixed mistakes for funding page PR 2017-03-10 23:06:01 +01:00
Anna
628c356832 Merge remote-tracking branch 'upstream/master' 2017-03-10 22:28:20 +01:00
Tom Christie
1d34bc0b92 Update release notes 2017-03-10 14:38:24 +00:00
Tom Christie
928f7cb40f Version 3.6.2 2017-03-10 13:00:08 +00:00
Tom Christie
7a8fb262f2 Fallback to more widely supported JS feature sets. (#4961) 2017-03-10 12:07:15 +00:00
Tom Christie
9ccdc4366f Merge branch 'master' of github.com:tomchristie/django-rest-framework 2017-03-10 10:59:39 +00:00
Tom Christie
9baa1fde15 Add 'mark_safe' in template tags. Closes #4952. Closes #4953. 2017-03-10 10:59:31 +00:00
Michael Palmer
81887bdc4e Add glyphicon fonts to static docs (#4951)
* Fixes #4950.
2017-03-10 10:37:31 +00:00
Tom Christie
5128004f54 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2017-03-10 09:10:54 +00:00
Tom Christie
f51bb5ac8b Drop unneeded comment 2017-03-10 09:10:29 +00:00
Tom Christie
8818aa9d58 Merge branch 'master' of https://github.com/cartyc/django-rest-framework into cartyc-master 2017-03-10 09:09:51 +00:00
Asif Saifuddin Auvi
baea07c511 converted testing test asserts to pytest (#4949)
* converted testing test asserts to pytest

* moved 3rd arg from test_empty_post_uses_default_boolean_value test assert
2017-03-10 09:00:00 +00:00
Tom Christie
0fe0a91aed Remove erronous HTML in example. Closes #4958 2017-03-10 08:51:19 +00:00
Anna
60bb3b0958 Updated funding page 2017-03-10 06:30:31 +01:00
Chris Carty
bc2c76a000 fixed issue on schemas.py where if model._meta.get_field(variable) failed model_field was not set to None and would reult in an error 2017-03-09 21:11:52 -05:00
Tom Christie
544b4b9948 Ensure 'markdown' dependancy is optional. Refs #4941. (#4947) 2017-03-09 16:50:00 +00:00
Tom Christie
b884bdd391 Add 3.6 release to index 2017-03-09 16:16:22 +00:00
Tom Christie
1d4290eb7b Tweak docs 2017-03-09 15:59:29 +00:00
Tom Christie
86931b01b6 Note dependancies in docs 2017-03-09 14:59:00 +00:00
Tom Christie
52db57a6e7 Version 3.6 (#4943) 2017-03-09 14:49:51 +00:00
Xavier Ordoquy
537df7a6ad Extract APISchemaView and APIRootView out of the DefaultRouter. (#4707) 2017-03-07 13:39:08 +00:00
Tibo Beijen
cf5d401a0e Allow required false and default (#4692)
* Default value will now be used when serializing if key or attribute is missing.
2017-03-07 13:19:19 +00:00
Md. Al-Amin
8a14b39e7d Added doc for removing pagination in generic-view. (#4940) 2017-03-06 18:33:27 +00:00
Tom Christie
0b708f04e1 Client library & API documentation docs (#4939) 2017-03-06 12:42:51 +00:00
Tom Christie
68d2020112 Live API documentation (#4755) 2017-03-03 15:24:37 +00:00
atkawa7
7f59ce1ec2 Directly using Django's JSONResponse in the Tutorial (#4935)
* directly using Django's JSONResponse

* fixed JsonResponse typo

* added safe=False to JsonResponse

* removed unnecessary 'safe=False' in JsonResponse
2017-03-03 14:04:41 +00:00
Tim Watts
8df340908b Add failing tests and fix for dict that have a key items #4931 (#4932) 2017-03-03 09:23:09 +00:00
José Padilla
35bccaab90 Merge pull request #4934 from ossanna16/master
Fixed broken mail link in tutorials and resources
2017-03-02 20:04:56 -05:00
Anna
ff4f252003 Fixed broken mail link in tutorials and resources 2017-03-03 00:40:57 +01:00
Peter JJ MacDonald
dfea596b0f Update django-filter requirement (#4933) 2017-03-01 21:27:23 +00:00
José Padilla
95380f7717 Merge pull request #4928 from tdruez/patch-1
Added a failing test for #4927
2017-03-01 08:52:27 -05:00