aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
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-13Minor tweaks to 'lookup_value_regex' workTom Christie
2014-01-13Merge pull request #1333 from bodylabs/2.4.0+lookup_regexTom Christie
Let viewsets specify their regex
2014-01-13Make HyperlinkedModelSerializer `url` field name customizableS.Prymak
2014-01-13Track changes that need noting in 2.4 announcementTom Christie
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-12Merge pull request #1348 from yprez/none-to-empty-string_2.4Tom Christie
Coerce None to empty string
2014-01-12Check the modelfield's class insteadYuri Prezument
2014-01-12Test for setting allow_none=True for nullable CharFieldsYuri Prezument
2014-01-12Set `allow_none = True` for CharFields with null=TrueYuri Prezument
2014-01-12CharField - add allow_null argumentYuri Prezument
2014-01-12Possible fix for #1330Yuri Prezument
Coerce None to '' in CharField.to_native()
2014-01-12Regression test for #1330 (Coerce None to '')Yuri Prezument
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-04Fix a typoPaul Melnikow
2014-01-04Router: Do not automatically adjust lookup_regex when trailing_slash is TruePaul Melnikow
BREAKING CHANGE When trailing_slash is set to True, the router no longer will adjust the lookup regex to allow it to include periods. To simulate the old behavior, the programmer should specify `lookup_regex = '[^/]+'` on the viewset. https://github.com/tomchristie/django-rest-framework/pull/1328#issuecomment-31517099
2014-01-04Allow viewset to specify lookup value regex for routingPaul Melnikow
This patch allows a viewset to define a pattern for its lookup field, which the router will honor. Without this patch, any characters are allowed in the lookup field, and overriding this behavior requires subclassing router and copying and pasting the implementation of get_lookup_regex. It's possible it would be better to remove this functionality from the routers and simply expose a parameter to get_lookup_regex which allows overriding the lookup_regex. That way the viewset config logic could be in the a subclass, which could invoke the super method directly. I'm using this now for PostgreSQL UUID fields using https://github.com/dcramer/django-uuidfield . Without this patch, that field passes the lookup string to the database driver, which raises a DataError to complain about the invalid UUID. It's possible the field ought to signal this error in a different way, which could obviate the need to specify a pattern.
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