aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-01-14Version 2.3.112.3.11Tom Christie
2014-01-14Added write_only and write_only_fields. Refs #1306Tom Christie
2014-01-13Minor tweaksTom Christie
2014-01-13Merge branch 'testing-nested-serializers' of ↵Tom Christie
git://github.com/dustinfarris/django-rest-framework into dustinfarris-testing-nested-serializers
2014-01-13Minor cleanupTom Christie
2014-01-13Move ImportingModelSerializerTests and add comments.Dustin Farris
2014-01-13Merge branch 'master' of git://github.com/cguethle/django-rest-framework ↵Tom Christie
into cguethle-master
2014-01-13Move models.resolve_model to serializers._resolve_modelDustin Farris
2014-01-13Merge pull request #1343 from linovia/hotfix/1129Tom Christie
Fix for #1129
2014-01-12Add a sanity check to avoid running into unresolved related models.Dustin Farris
2014-01-10Merge pull request #1345 from bodylabs/serializers_docTom Christie
serializers.md: Fix typos
2014-01-10serializers.md: Fix typosPaul Melnikow
2014-01-09Removed useless try/exceptXavier Ordoquy
2014-01-09Test case for #1129Xavier Ordoquy
2014-01-09Merge pull request #1342 from yprez/fix_field_docTom Christie
Fix URL/Slug Field signatures in docs
2014-01-09Move serializer import to top-level causes test errorDustin Farris
2014-01-09Fix URL/Slug Field signatures in docsYuri Prezument
2014-01-09Merge pull request #1341 from fredrikmollerstrand/docstring-typo-fixTom Christie
fix docstring typos.
2014-01-09fix docstring typos.Fredrik Möllerstrand
2014-01-08Testing nested serializers with models that have str foreign key references.Dustin Farris
2014-01-08Use www.django-rest-framework.org for docs instead of ↵Tom Christie
django-rest-framework.org due to issues with naked domains
2014-01-08Use www.django-rest-framework.org for docs instead of ↵Tom Christie
django-rest-framework.org due to issues with naked domains
2014-01-07Drop the logo from the project READMETom Christie
2014-01-07Center logoTom Christie
2014-01-07Merge branch 'logo'Tom Christie
2014-01-07New font in logoTom Christie
2014-01-06Added "nofollow" against docs link.Tom Christie
2014-01-03Merge branch 'master' into logoTom Christie
2014-01-03Link to BrightAPI, and remove ad except from frontpageTom Christie
2014-01-03Frontpage tweaksTom Christie
2014-01-02Merge pull request #1329 from estebistec/fix-serializer-from-native-sigTom Christie
FIX BaseSerializer.from_native has an altered signature
2014-01-02Merge pull request #1325 from kevin-brown/compat_fixTom Christie
Fix bugfix note
2014-01-02FIX BaseSerializer.from_native has an altered signatureSteven Cummings
* base classes define it with one parameter * BaseSerializer currently defines a second parameter, which we make optional here for method-dispatch passivity
2014-01-02Merge pull request #1327 from bodylabs/tox_linkTom Christie
FIx link to tox
2014-01-02FIx link to toxPaul Melnikow
2014-01-02Fix bugfix noteKevin Brown
This fixes a bugfix note that was added because of #1293, which pointed out that a change in a bugfix [1] broke backwards compatibility. The bugfix did not work as expected because a variable was quoted when it should not have been. This removes the quotes around the variable, which brings back the expected functionality.
2014-01-02Merge pull request #1318 from sheppard/generic-dj16Tom Christie
saving nested generic relation serializers broken in django 1.6
2014-01-02Happy new yearTom Christie
2013-12-23fix for genericrelation savingS. Andrew Sheppard
2013-12-23can't save genericrelations via nested serializers in django 1.6S. Andrew Sheppard
2013-12-23Fuller notes on the 'base_name' argument. Closes #1160.Tom Christie
2013-12-23Added note on view_name in hyperlinked relationships. Closes #1221Tom Christie
2013-12-23Merge branch 'patch-1' of git://github.com/bennbollay/django-rest-framework ↵Tom Christie
into bennbollay-patch-2
2013-12-23Tweak test styleTom Christie
2013-12-23Updated release notesTom Christie
2013-12-23Updated tests to pass in python 3Tom Christie
2013-12-23Merge branch 'master' of git://github.com/flisky/django-rest-framework into ↵Tom Christie
flisky-master
2013-12-23Back out permissions example change in favor of easier to follow exampleTom Christie
2013-12-23Merge pull request #1315 from amatellanes/masterTom Christie
Simplified some examples in tutorial
2013-12-23Simplified some examples in tutorialamatellanes