aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-03-13Fix lookup_url_kwarg handling in viewsets.Raphaël Barrois
The ``lookup_url_kwarg`` is intended to set the name of a field in the URL regexps when using custom ``lookup_field``, but the routers ignore it altogether.
2015-03-13Fix the link to the old doc (#2681).Xavier Ordoquy
2015-03-12Merge pull request #2678 from vikingco/fix/ugettext-in-paginationJosé Padilla
Fixed problem with imporing rest_framework.views in apps.py
2015-03-12Fixed problem with imporing rest_framework.views in apps.pyDirk Moors
2015-03-11Merge pull request #2671 from esmail/patch-2José Padilla
Fix example of explicit format URL (for real).
2015-03-11Fix example of explicit format URL (for real).Esmail
Do what I meant to do in #2670: The link is displayed in the tutorial as "http://example.com/api/items/4.json" but the hyperlink itself and what the example code actually works with are (in my opinion, less pretty) URLs like "http://example.com/api/items/4/.json".
2015-03-11Merge pull request #2668 from Maplecroft/doc_fixesXavier Ordoquy
Fix for minor documentation typo
2015-03-11Fixed import statement in API docsJames Rutherford
2015-03-11Merge pull request #1 from tomchristie/masterJames Rutherford
Merge in from upstream
2015-03-10Merge pull request #2666 from balsdorf/patch-1José Padilla
Changed incorrect class name in pagination docs
2015-03-10Changed incorrect class nameBryan Alsdorf
2015-03-09Fixed a typo in the documentation's link.Xavier Ordoquy
2015-03-09Merge pull request #2652 from jpadilla/masterTom Christie
Remove the 'docs for 3.0' banners.
2015-03-09Merge pull request #2655 from jwbixby/patch-1Tom Christie
Update documentation over PAGE_SIZE
2015-03-09Merge pull request #2658 from ddx/cursorpagination-docs-typoTom Christie
Fixed missing word in CursorPagination docs
2015-03-09Fixed missing word in CursorPagination docsDeven Xie
2015-03-08Merge pull request #2637 from ↵Carlton Gibson
mdentremont/topic/allow-serialize-unsaved-with-relations Support serializing unsaved models with related fields.
2015-03-08Update documenation over PAGE_SIZEjwbixby
This replaces all locations of the old setting `DEFAULT_PAGE_SIZE` for the current setting `PAGE_SIZE`
2015-03-07Update to 3.1 releaseJosé Padilla
2015-03-07Remove docs for 3.0 bannersJosé Padilla
2015-03-07Fix permissions on markdown filesJosé Padilla
2015-03-06Merge pull request #2640 from Crystalnix/fix-remove-mergedictJosé Padilla
Remove `MergeDict`
2015-03-06Add support for serializing models with m2m related fieldsMatt d'Entremont
- In both ManyRelatedField, provide an empty return when trying to access a relation field if the instance in question has no PK (so likely hasn't been inserted yet) - Add relevant tests - Without these changes, exceptions would be raised when trying to serialize the uncreated models as it is impossible to query relations without a PK - Add test to ensure RelatedField does not regress as currently supports being serialized with and unsaved model
2015-03-06Merge pull request #2643 from jpadilla/masterTom Christie
Fix customizing field mappings link
2015-03-06Fix customizing field mappings linkJosé Padilla
2015-03-06Better docs linkingTom Christie
2015-03-06More docs on cursor pagination3.1.0Tom Christie
2015-03-06Tweaks for cursor pagination and docsTom Christie
2015-03-05Remove `MergeDict`Egor Yurtaev
The class MergeDict is deprecated and will be removed in Django 1.9
2015-03-04Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2015-03-04Update docsTom Christie
2015-03-04Clean up pagination attributesTom Christie
2015-03-03Merge pull request #2628 from maryokhin/patch-2Tom Christie
CreateOnlyDefault call default.set_context() only on create
2015-03-03Call default.set_context() only on create. Refs #2619.Tymur Maryokhin
2015-03-02Merge pull request #2619 from kwood/masterTom Christie
Updated CreateOnlyDefault to call set_context on its default
2015-02-28Fix docstring formattingKevin Wood
2015-02-27Updated CreateOnlyDefault to call set_context on its default (if callable)Kevin Wood
2015-02-27Merge pull request #2616 from jerzyk/fix_dictfieldJosé Padilla
fix DictKey initial value
2015-02-27fix DictKey initial valueJanusz Harkot
2015-02-27Merge pull request #2584 from aRkadeFR/DocFixingTypoJosé Padilla
Documentation test fix double word
2015-02-27update for `that the` instead of `that`aRkadeFR
2015-02-27Merge pull request #2613 from Ian-Foote/python2-validatorsJosé Padilla
Ensure validators are new-style classes on python2
2015-02-27Ensure validators are new-style classes on python2Ian Foote
2015-02-27Merge pull request #2608 from ↵Tom Christie
ezheidtmann/dont-swallow-errors-in-callable-sources Dont swallow errors in callable sources
2015-02-26Add explanation for this exception mutationEvan Heidtmann
2015-02-26Avoid swallowing exceptions thrown in callable attributesEvan Heidtmann
2015-02-26Add tests for callable attributes raising exceptionsEvan Heidtmann
2015-02-26Merge pull request #2572 from Ins1ne/masterTom Christie
Fix UniqueTogetherValidator for NULL values
2015-02-26Merge pull request #2602 from dbrgn/fix-1602Tom Christie
List resource not updated between requests
2015-02-26Merge pull request #2606 from tomchristie/1.8-betaTom Christie
Formally upgrade suport to Django 1.8-beta