Commit Graph

4602 Commits

Author SHA1 Message Date
Tom Christie
a88a37a8ce Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-27 15:14:25 +00:00
Tom Christie
8579222cbd Fix for nested attribute lookups where one is a callable 2014-11-27 15:14:11 +00:00
Tom Christie
b73cc71666 Merge pull request #2149 from jpadilla/master
Update to latest minor Django versions
2014-11-27 14:00:30 +00:00
José Padilla
fceeecf1e2 Update to latest minor Django versions 2014-11-27 09:06:37 -04:00
Tom Christie
2fe6709769 Fix sponsor images for mkdocs 2014-11-27 11:00:57 +00:00
Tom Christie
5a33adc032 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-27 08:11:03 +00:00
Tom Christie
1ffe4857ec Support callable attributes in dotted source. Closes #2142. 2014-11-27 08:10:52 +00:00
Tom Christie
5155aa4d28 Merge pull request #2144 from jpadilla/patch-2
Remove Third party packages section
2014-11-27 08:07:49 +00:00
José Padilla
9b88c096e0 Remove Third party packages section
Information about Third party packages is already covered under the Third Party Resources topic
2014-11-26 18:12:12 -04:00
Tom Christie
f203c75ede Merge pull request #2141 from willstott101/once-one
tutorial typo fix
2014-11-26 19:28:24 +00:00
Will Stott
d0e245baba grammar 2014-11-26 15:51:28 +00:00
Will Stott
34bd2b7828 a few typos 2014-11-26 15:48:08 +00:00
Tom Christie
2647e1aaaa Move Quickstart back into 'Tutorial' section 2014-11-25 16:30:17 +00:00
Tom Christie
b733f85ff1 Minor docs tweaks 2014-11-25 16:24:35 +00:00
Tom Christie
c7701cd75a Tweak 2014-11-25 16:08:48 +00:00
Tom Christie
0ba94d7595 Merge branch 'master' of https://github.com/tomchristie/django-rest-framework 2014-11-25 16:07:14 +00:00
Tom Christie
306916aca1 Merge branch 'd0ugal-mkdocs' 2014-11-25 16:06:45 +00:00
Tom Christie
84b34d4330 Use default 'site' directory for docs builds 2014-11-25 16:06:18 +00:00
Tom Christie
929135ea58 Include CNAME file 2014-11-25 16:01:32 +00:00
Tom Christie
d7f8047add Merge branch 'mkdocs' of git://github.com/d0ugal/django-rest-framework into d0ugal-mkdocs 2014-11-25 15:52:36 +00:00
Tom Christie
eeb07ad938 Merge pull request #2133 from jpadilla/tox
Add markdown and PyYAML to tox test requirements
2014-11-25 15:46:03 +00:00
José Padilla
653d626b3c Fix failing YAML tests 2014-11-25 11:33:18 -04:00
Tom Christie
64d8e3dcb6 Typo. Refs #2132. 2014-11-25 13:50:35 +00:00
Tom Christie
228c7e1699 Merge pull request #2132 from jpadilla/third-party-packages
Document writing third party packages
2014-11-25 13:49:52 +00:00
José Padilla
38fe2c9dad Document writing third party packages
Add the following sections:
- “About Third Party Packages”
- “How to create a Third Party Package”
- “Existing Third Party Packages”

Resolve #2043
2014-11-25 09:38:48 -04:00
José Padilla
e1b8412eed Add markdown and PyYAML to tox test requirements 2014-11-25 09:22:29 -04:00
Dougal Matthews
66fc51de5c Use the is_homepage property. 2014-11-25 13:14:51 +00:00
Dougal Matthews
673f48242f Remove commented out title 2014-11-25 13:11:30 +00:00
Dougal Matthews
4d28a09309 Refer to the current_page title rather than filename 2014-11-25 13:09:47 +00:00
Dougal Matthews
935d94c034 Don't add main to the top level items on the home page 2014-11-25 13:07:35 +00:00
Dougal Matthews
aa1a844154 Add The title to the top of the TOC for the home page 2014-11-25 13:05:48 +00:00
Dougal Matthews
f2d4e51aaa Mark the homepage as active when visited 2014-11-25 12:44:26 +00:00
Dougal Matthews
a0c12bf7c5 Change the background of the selected page on the dropdown 2014-11-25 12:44:26 +00:00
Dougal Matthews
deb2bb4376 Add Home link to the theme 2014-11-25 12:44:26 +00:00
Dougal Matthews
5a6bdd01ba Highlight H1's in the TOC 2014-11-25 12:44:26 +00:00
Dougal Matthews
df33538f14 Make the quotes consistent 2014-11-25 12:44:26 +00:00
Dougal Matthews
6f28adeefe Added nicer page titles 2014-11-25 12:44:26 +00:00
Dougal Matthews
8677316959 Disable prev and next links 2014-11-25 12:44:26 +00:00
Dougal Matthews
b8aa7e0c34 Fix previous and next links 2014-11-25 12:44:26 +00:00
José Padilla
200e0b17da Clean up extra white space 2014-11-25 12:44:11 +00:00
José Padilla
06683b86b2 Use single quotes for consistency
Conflicts:
	mkdocs.yml
2014-11-25 12:44:11 +00:00
José Padilla
3bfc82068b Update tabbing and cleanup theme templates 2014-11-25 12:44:11 +00:00
José Padilla
361827350a Move content template into base.html 2014-11-25 12:44:11 +00:00
José Padilla
16d442dda3 Use MkDocs meta.source to render source code links 2014-11-25 12:44:11 +00:00
Dougal Matthews
cbb6799d2d Add validators from 2762205887 and
254701230d
2014-11-25 12:44:11 +00:00
Dougal Matthews
78223eb8ef Fixed copypasta fail 2014-11-25 12:43:42 +00:00
Dougal Matthews
d72a56f37f Move the docs theme out of the docs folder. 2014-11-25 12:43:42 +00:00
Dougal Matthews
6a10b90f72 Correct the capitalisation of API 2014-11-25 12:43:42 +00:00
Dougal Matthews
5d479c20d8 Move nav to it's own template based on the MkDocs theme 2014-11-25 12:43:42 +00:00
Dougal Matthews
b443f81481 Add meta description 2014-11-25 12:43:42 +00:00