django-rest-framework/docs/api-guide, branch 2.1.5 Web APIs for Django. Merge remote-tracking branch 'upstream/master' into partial-update 2012-11-21T17:37:22+00:00 Mark Aaron Shirley 2012-11-21T17:37:22+00:00 0876bed96304c3c2125e0de67736d40bfe921cf7 






updated comparison due to pep8 programming recommendations
2012-11-21T12:35:20+00:00

Stephan Groß

2012-11-21T12:35:20+00:00

9459289d7d388074045b726225cb6e140f3c18c3

http://www.python.org/dev/peps/pep-0008/#programming-recommendations





http://www.python.org/dev/peps/pep-0008/#programming-recommendations







Merge remote-tracking branch 'upstream/master' into regex_field
2012-11-21T10:56:34+00:00

Stephan Groß

2012-11-21T10:56:34+00:00

6ba4df8a27016fd5e60a3852eea6c97231a03281

Conflicts:
	docs/topics/release-notes.md





Conflicts:
	docs/topics/release-notes.md







Documentation changes for partial serializer updates
2012-11-20T23:57:54+00:00

Mark Aaron Shirley

2012-11-20T23:57:54+00:00

3b43d41e918b70e5ce83f7da2caabcae2e1bcd72












Merge pull request #430 from j4mie/serializer-method-field
2012-11-20T23:30:30+00:00

Tom Christie

2012-11-20T23:30:30+00:00

8e8b23b6a9aece32ae5c028a72969777f1ddc7ae

Serializer method field




Serializer method field






added RegexField
2012-11-20T14:38:50+00:00

Stephan Groß

2012-11-20T14:38:50+00:00

86484668f689864aa54e127a8107bdee55240cea












Add example use of SerializerMethodField to docs
2012-11-20T13:25:21+00:00

Jamie Matthews

2012-11-20T13:25:21+00:00

5f4c385a86b877217c1e1bc2eaff58206eabb747












More docs tweaking.
2012-11-19T22:08:38+00:00

Tom Christie

2012-11-19T22:08:38+00:00

a44a94dd6ea2d9497264e267a0354cb684d398f6












Docs tweaks.
2012-11-19T21:42:33+00:00

Tom Christie

2012-11-19T21:42:33+00:00

ce5b186ca869b693c945200581ba893123a63ce8












Tweaks to SerializerMethodField docs
2012-11-19T17:24:08+00:00

Jamie Matthews

2012-11-19T17:24:08+00:00

3ab8c4966d065e930bd6e8bc6c26934ae5c5918c