aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-05-18expose the fields metadata via OPTIONS as described in ↵Nikolaus Schlemm
https://github.com/tomchristie/django-rest-framework/issues/192 missing: - get fields for method (currently all the same) - tests - right placement of code
2013-05-18Merge pull request #858 from minddust/fix_710Tom Christie
Fix for #710
2013-05-18Added @andymckay for refactoring #860Tom Christie
2013-05-18Merge pull request #860 from andymckay/masterTom Christie
startswith can take a tuple
2013-05-18Merge pull request #857 from pyriku/675-empty-label-related-fieldTom Christie
Display an empty label into related fields if it isn't required
2013-05-18Removed unicode literalsPablo Recio
2013-05-18Merge branch 'master' into 675-empty-label-related-fieldPablo Recio
2013-05-18startswith can take a tupleAndy McKay
2013-05-18Update getattrStephan Groß
2013-05-18Merge pull request #859 from craigds/masterTom Christie
fix for #765
2013-05-18Move and rename LabelModelSerializer for further reuseMarkus Törnqvist
2013-05-18Styling tweaksTom Christie
2013-05-18Turns out label and help_text are not always thereMarkus Törnqvist
2013-05-18Merge branch 'master' of https://github.com/mmcardle/django-rest-framework ↵Tom Christie
into styling-fixes
2013-05-18Remove unused varStephan Groß
2013-05-18Temp commit for branch change ;-)Stephan Groß
2013-05-18Tweak docsTom Christie
2013-05-18Merge pull request #856 from grimborg/http_debug_error_page_docTom Christie
added comment about error behavior with DEBUG=True
2013-05-18MergeTom Christie
2013-05-18Clean up test case.Ryan Kaskel
2013-05-18when source='*' on a nested serializer, expand fields into outer serializer ↵Craig de Stigter
when writing. fixes #765
2013-05-18Merge latest changes from master.Ryan Kaskel
2013-05-18Fix for #710Stephan Groß
2013-05-18Merge latest changes from master.Ryan Kaskel
2013-05-18Added @grimborg and @ryankask. Go Team. :)Tom Christie
2013-05-18Display an empty label into related fields if it isn't requiredPablo Recio
2013-05-18added comment about error behavior with DEBUG=TrueOscar Vilaplana
2013-05-18documentation for ↵Mark McArdle
https://github.com/tomchristie/django-rest-framework/issues/775
2013-05-18Renderer uses form field's label and help, not attribute nameMarkus Törnqvist
2013-05-18Merge branch 'master' of git://github.com/tomchristie/django-rest-frameworkMark McArdle
2013-05-18ToMany fields default to read-only if targeting ManyToManyField.Ryan Kaskel
2013-05-18Initial commit of fix for ↵Mark McArdle
https://github.com/tomchristie/django-rest-framework/issues/775
2013-05-18Added @craigds, @pyriku, @brianz - Yay for sprints!Tom Christie
2013-05-18Merge pull request #831 from brianz/masterTom Christie
Allow nested fields to be missing
2013-05-18Merge pull request #853 from pyriku/725-blank-choice-dashTom Christie
Adds BLANK_CHOICE_DASH as a choice item
2013-05-18Moved test model into closer to the testcasePablo Recio
2013-05-18Merge branch 'master' into 725-blank-choice-dashPablo Recio
Conflicts: rest_framework/tests/fields.py
2013-05-18Adding `BLANK_CHOICE_DASH` as a choice if the model's field isn't requiredPablo Recio
2013-05-18Merge pull request #851 from linovia/masterTom Christie
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
2013-05-18A model's field is required if is null or blankPablo Recio
2013-05-18Merge pull request #694 from craigds/masterTom Christie
fix function names and dotted lookups for use in PrimaryKeyRelatedField
2013-05-18add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and ↵Craig de Stigter
HyperlinkedRelatedField. #694
2013-05-18ManyHyperlinkedRelatedField comes form rest_framework.relations nowMarkus Törnqvist
2013-05-18serializers.Field respects ordering on dicts if it exists. Closes #832Tom Christie
2013-05-18Use smart_text() instead of nonexistant smart_unicode()Markus Törnqvist
2013-05-18Merge branch 'mikee2185-master' into mjtorn-masterMarkus Törnqvist
Conflicts: rest_framework/fields.py rest_framework/serializers.py rest_framework/tests/models.py rest_framework/tests/serializer.py Fixed all the conflicts.
2013-05-18add tests for related field source for HyperlinkedRelatedField. #694Craig de Stigter
2013-05-18add tests for related field source for RelatedField and ↵Craig de Stigter
PrimaryKeyRelatedField. #694
2013-05-18Updated the dependencies version and added the ALLOWED_HOSTS for tests.Xavier Ordoquy
2013-05-18Merge pull request #850 from tomchristie/dynamic-formsTom Christie
Forms in Broseable API support dynamic serializers based on request method