Code

Merge upstream#2

Code

Merged

BrickXu merged 127 commits intoBrickXu:masterBrickXu/django-rest-framework:masterfrom encode:masterencode/django-rest-framework:masterCopy head branch name to clipboardDec 2, 2014

+2,217-5,574

Commits

Commits on Oct 8, 2014

• Reverted 59d0a03 and fixed the tests

  xordoquy

  committed
  311d315

Commits on Nov 18, 2014

• Ensure _resolve_model does not return None

  beck

  committed
  6773568

Commits on Nov 25, 2014

• Streamlined tox config with 1.8 features

  maryokhin

  committed
  585054f

• Updated travis config

  maryokhin

  committed
  1fcb495

• Added python 3.2 to test against django master . Related to #2075.

  maryokhin

  committed
  b6de266

• Fix shoddy test case

  tomchristie

  committed
  9c58dfe

• Documentation in 'many_init' docstring. Refs #2120.

  tomchristie

  committed
  fd980be

• Merge pull request #2123 from NextHub/master

  Show description for 85f5e79
  tomchristie

  committed
  85f5e79

• Removed dots in Django versions in tox. Refs #2124.

  maryokhin

  committed
  c559ec6

• Merge pull request #2126 from NextHub/master

  Show description for 17c7431
  tomchristie

  committed
  17c7431

• Don't use default_empty_html value for partial updates. Closes #2118.

  tomchristie

  committed
  06fd63d

• Missing quotes on validate_score example

  marctc

  committed
  83e556b

• request.DATA, request.FILES -> request.data

  tomchristie

  committed
  2e726e2

• Merge pull request #2127 from marctc/patch-1

  Show description for b39bd7c
  tomchristie

  committed
  b39bd7c

• Add missing period.

  tomchristie

  committed
  a3c0c8f

• Docs on ValidationError

  tomchristie

  committed
  c4dff54

• Hypenate 'un-coerced'

  tomchristie

  committed
  8328125

• Drop 0.x release notes

  tomchristie

  committed
  3b40f8c

• Migrate documentation to MkDocs proper

  d0ugal

  committed
  3a648b9

• Fixed typos in the config and updated Google analytics

  d0ugal

  committed
  b2762cb

• Remove redundant requirements file

  d0ugal

  committed
  261c4ce

• Add the kickstarter annoucement to the TOC

  d0ugal

  committed
  ae36a25

• Add a docs build to the Tox run

  d0ugal

  committed
  04abe98

• Change site_dir to html to match mkdocs.py

  d0ugal

  committed
  84d9c4b

• Remove the site ignore which isn't needed as we will use the html output

  Show description for 792c0c2
  d0ugal

  committed
  792c0c2

• Drop simply from the mkdocs install lines

  Show description for 2ddef2d
  d0ugal

  committed
  2ddef2d

• Use page_title instead of title in docs theme

  

  jpadilla

  authored and

  d0ugal

  committed
  d6b203f

• Fix the Navigation style

  d0ugal

  committed
  18712a5

• Bring back the promo section

  d0ugal

  committed
  49a493f

• Add next and previous page.

  d0ugal

  committed
  3c49b9f

• Fixed the TOC (again)

  Show description for 5600878
  d0ugal

  committed
  5600878

• Add a workaround for not having the index name

  d0ugal

  committed
  6da9d5a

• Add meta description

  d0ugal

  committed
  b443f81

• Move nav to it's own template based on the MkDocs theme

  d0ugal

  committed
  5d479c2

• Correct the capitalisation of API

  d0ugal

  committed
  6a10b90

• Move the docs theme out of the docs folder.

  d0ugal

  committed
  d72a56f

• Fixed copypasta fail

  d0ugal

  committed
  78223eb

• Add validators from 2762205 and

  Show description for cbb6799
  d0ugal

  committed
  cbb6799

• Use MkDocs meta.source to render source code links

  

  jpadilla

  authored and

  d0ugal

  committed
  16d442d

• Move content template into base.html

  

  jpadilla

  authored and

  d0ugal

  committed
  3618273

• Update tabbing and cleanup theme templates

  

  jpadilla

  authored and

  d0ugal

  committed
  3bfc820

• Use single quotes for consistency

  Show description for 06683b8
  

  jpadilla

  authored and

  d0ugal

  committed
  06683b8

• Clean up extra white space

  

  jpadilla

  authored and

  d0ugal

  committed
  200e0b1

• Fix previous and next links

  d0ugal

  committed
  b8aa7e0

• Disable prev and next links

  d0ugal

  committed
  8677316

• Added nicer page titles

  d0ugal

  committed
  6f28ade

• Make the quotes consistent

  d0ugal

  committed
  df33538

• Highlight H1's in the TOC

  d0ugal

  committed
  5a6bdd0

• Add Home link to the theme

  d0ugal

  committed
  deb2bb4

• Change the background of the selected page on the dropdown

  d0ugal

  committed
  a0c12bf

• Mark the homepage as active when visited

  d0ugal

  committed
  f2d4e51

• Add The title to the top of the TOC for the home page

  d0ugal

  committed
  aa1a844

• Don't add main to the top level items on the home page

  d0ugal

  committed
  935d94c

• Refer to the current_page title rather than filename

  d0ugal

  committed
  4d28a09

• Remove commented out title

  d0ugal

  committed
  673f482

• Use the is_homepage property.

  d0ugal

  committed
  66fc51d

• Add markdown and PyYAML to tox test requirements

  jpadilla

  committed
  e1b8412

• Document writing third party packages

  Show description for 38fe2c9
  jpadilla

  committed
  38fe2c9

• Merge pull request #2132 from jpadilla/third-party-packages

  Show description for 228c7e1
  tomchristie

  committed
  228c7e1

• Typo. Refs #2132.

  tomchristie

  committed
  64d8e3d

• Fix failing YAML tests

  jpadilla

  committed
  653d626

• Merge pull request #2133 from jpadilla/tox

  Show description for eeb07ad
  tomchristie

  committed
  eeb07ad

• Add missing options

  tomchristie

  committed
  8c91e7b

• Merge branch 'mkdocs' of git://github.com/d0ugal/django-rest-framework into d0ugal-mkdocs

  tomchristie

  committed
  d7f8047

• Include CNAME file

  tomchristie

  committed
  929135e

• Use default 'site' directory for docs builds

  tomchristie

  committed
  84b34d4

• Merge branch 'd0ugal-mkdocs'

  tomchristie

  committed
  306916a

• Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

  tomchristie

  committed
  0ba94d7

• Tweak

  tomchristie

  committed
  c7701cd

• Minor docs tweaks

  tomchristie

  committed
  b733f85

• Merge master

  tomchristie

  committed
  f13c0eb

• Add validators page

  tomchristie

  committed
  4ed0ae8

• Move Quickstart back into 'Tutorial' section

  tomchristie

  committed
  2647e1a

• Merge branch 'master' into 3.0-docs

  tomchristie

  committed
  6c396a4

• Updating fields docs

  tomchristie

  committed
  3153656

Commits on Nov 26, 2014

• perform_create, perform_update, perform_destroy hooks

  tomchristie

  committed
  c01c631

• Call out removal of pre_save/post_save more strongly

  tomchristie

  committed
  0f5338a

• 3.0 docs for serializer fields

  tomchristie

  committed
  e1b14cb

• Update notes on autocomplete

  tomchristie

  committed
  678f7b4

• Docstring for 'many_init'

  tomchristie

  committed
  b4550c6

• 3.0 docs and tidy-up for serializer relationships

  tomchristie

  committed
  5a5a73c

• Tweak to 3.0 relationship docs

  tomchristie

  committed
  786cab7

• Merge remote-tracking branch 'reference/master' into bugfix/1850

  xordoquy

  committed
  f5e5ed0

• a few typos

  willstott101

  committed
  34bd2b7

• grammar

  willstott101

  committed
  d0e245b

• Merge pull request #2141 from willstott101/once-one

  Show description for f203c75
  tomchristie

  committed
  f203c75

• Be nicer with __closable_objects.

  xordoquy

  committed
  7674144

• Remove Third party packages section

  Show description for 9b88c09
  jpadilla

  committed
  9b88c09

Commits on Nov 27, 2014

• Merge pull request #2144 from jpadilla/patch-2

  Show description for 5155aa4
  tomchristie

  committed
  5155aa4

• 3.0 serializer docs

  tomchristie

  committed
  0262262

• Support callable attributes in dotted source. Closes #2142.

  tomchristie

  committed
  1ffe485

• Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

  tomchristie

  committed
  5a33adc

• Fix sponsor images for mkdocs

  tomchristie

  committed
  2fe6709

• Update to latest minor Django versions

  jpadilla

  committed
  fceeecf

• Merge pull request #2149 from jpadilla/master

  Show description for b73cc71
  tomchristie

  committed
  b73cc71

• Fix for nested attribute lookups where one is a callable

  tomchristie

  committed
  8579222

• Merge branch 'master' of https://github.com/tomchristie/django-rest-framework

  tomchristie

  committed
  a88a37a

• Drop transform_<field_name>

  tomchristie

  committed
  6b2033f

• Drop Field.validate

  tomchristie

  committed
  d2d7e1d

• Notes on removal of Field.validate() and Serializer.transform_<field_name>

  tomchristie

  committed
  c61c59f

Commits on Nov 28, 2014

• Moar docs. Amazing.

  tomchristie

  committed
  34ca8cd

• Merge branch '3.0-docs'

  tomchristie

  committed
  d4b8e35

• Docs on nested creates/updates and suchlike

  tomchristie

  committed
  276a2a5

• Update token auth view. Closes #2151.

  maryokhin

  committed
  0539b1b

• Removed unused import

  maryokhin

  committed
  d9a09f7

• Docs. Minor tweaks.

  tomchristie

  committed
  05a86e3

• Drop google_analytics config since it's in the base template anyways.

  tomchristie

  committed
  9e03b08

• Add 'built with MkDocs' footer

  tomchristie

  committed
  d84582f

• Drop defunct tests

  tomchristie

  committed
  c8764de

• Docs. Sponsor call-out.

  tomchristie

  committed
  66b3dae

• Merge pull request #2153 from maryokhin/patch-1

  Show description for a741418
  

  Carlton Gibson

  committed
  a741418

• Add 2.x notes and links

  tomchristie

  committed
  8e549a7

• Finalizing 3.0 release notes

  tomchristie

  committed
  9ba29a8

• Merge pull request #2143 from linovia/bugfix/1850

  Show description for 8d989bb
  tomchristie

  committed
  8d989bb

• Merge pull request #2086 from beck/doug/blow-up-with-bad-models

  Show description for 6fbd23a
  tomchristie

  committed
  6fbd23a

• Use ImproperlyConfigured when model meta lookup fails

  tomchristie

  committed
  3a5b377

• @api_view defaults to allowing GET

  tomchristie

  committed
  08c727a

• Minor tweaks to contributing docs

  tomchristie

  committed
  caf1de3

Commits on Dec 1, 2014

• Add 3.0 announcement

  tomchristie

  committed
  72c4ec4

• Support Django's core ValidationError for backwards compat. Refs #2145.

  tomchristie

  committed
  b9503cd

• More descriptive docstring on ModelSerializer

  tomchristie

  committed
  22c5b86

• Minor validtors tweak

  tomchristie

  committed
  270c7ac

• Minor 3.0 announcment tweaks

  tomchristie

  committed
  1caa14d

• Add missing 'validators.py' link. Closes #2166.

  tomchristie

  committed
  555c450

• Change allow_none to allow_null

  jpadilla

  committed
  080fa4f

• Merge pull request #2167 from jpadilla/patch-1

  Show description for 7b8699a
  xordoquy

  committed
  7b8699a

• Fix requirements. Closes #2170.

  tomchristie

  committed
  d1fe61c