aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2013-05-20Merge pull request #872 from Neamar/masterTom Christie
Removed typo from documentation
2013-05-20Legacy parameter orderNeamar
2013-05-20Corrected docs (authentication instead of filtering)Neamar
2013-05-19removed TODOOscar Vilaplana
2013-05-19removed TODOOscar Vilaplana
2013-05-19removed TODOOscar Vilaplana
2013-05-19fixed tests, added docs, renamed helper methodOscar Vilaplana
2013-05-19fixed merge conflictOscar Vilaplana
2013-05-19* make test assertion more explicitNikolaus Schlemm
* cleanup
2013-05-19Added min_length and max_lengthOscar Vilaplana
2013-05-19Removed unused importsOscar Vilaplana
2013-05-19s/Single Character/String/Oscar Vilaplana
2013-05-19Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' ↵Nikolaus Schlemm
into issue-192-expose-fields-for-options
2013-05-19Added tests, cleaned up importsOscar Vilaplana
2013-05-19use double quotes for docstring instead of single quotesNikolaus Schlemm
2013-05-19Merge branch 'issue-192-expose-fields-for-options' of ↵Oscar Vilaplana
github.com:grimborg/django-rest-framework into issue-192-expose-fields-for-options
2013-05-19Merge pull request #2 from nschlemm/issue-192-expose-fields-for-optionsÒscar Vilaplana
Issue 192 expose fields for options
2013-05-19FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for ↵Nikolaus Schlemm
parameters like e.g. filter or paginate
2013-05-19Merge branch 'issue-192-expose-fields-for-options' of ↵Oscar Vilaplana
github.com:nschlemm/django-rest-framework into issue-192-expose-fields-for-options
2013-05-19Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' ↵Nikolaus Schlemm
into issue-192-expose-fields-for-options
2013-05-19don't expose fields for GET and DELETE - leaving room for parameters like ↵Nikolaus Schlemm
e.g. filter or paginate
2013-05-19WORKAROUND: avoid errors like "AttributeError: 'APIRoot' object has no ↵Nikolaus Schlemm
attribute 'get_serializer'"
2013-05-19Disabled label and help_text in unit test. We should change the test soOscar Vilaplana
that it sets them up.
2013-05-19Made field label optional in OPTIONSOscar Vilaplana
2013-05-19Merge pull request #1 from nschlemm/issue-192-expose-fields-for-optionsÒscar Vilaplana
Merged work in progress for Issue 192 expose fields for options
2013-05-19Integrated status quo of grimborg's awesome humanize_field() for exposing ↵Nikolaus Schlemm
field metadata via OPTIONS :)
2013-05-19Merge branch 'master' of git://github.com/tomchristie/django-rest-framework ↵Nikolaus Schlemm
into issue-192-expose-fields-for-options
2013-05-18Only use object permissions in browsable api form generation if an object existsTom Christie
2013-05-18Enforce object permissions check when rendering forms in browseable APITom Christie
2013-05-18Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-05-18Fix broken 'binary content' in browseable APITom Christie
2013-05-18Merge branch 'issue-192-expose-fields-for-options' of ↵Nikolaus Schlemm
git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options Conflicts: rest_framework/tests/fields.py
2013-05-18Added @lolek09 for work on #862. Kick ass!Tom Christie
2013-05-18added unittests for permission check of exposing actions via OPTIONSNikolaus Schlemm
2013-05-18added tests for formOscar Vilaplana
2013-05-18Correct charset on UnicodeJSONRendererTom Christie
2013-05-18Merge branch 'master' of https://github.com/tomchristie/django-rest-frameworkTom Christie
2013-05-18Added proper charset supportTom Christie
2013-05-18Added humanized field names and typesOscar Vilaplana
2013-05-18Added @matteosuppo for work on #865. Thanks!Tom Christie
2013-05-18Merge pull request #865 from ryankask/issue-747-lazy-strings-serializedTom Christie
Issue 747 lazy strings serialized
2013-05-18Move function to compat.Ryan Kaskel
2013-05-18Merge pull request #864 from minddust/fix_missing_min_valuesTom Christie
Fix missing min values
2013-05-18Merge pull request #863 from pyriku/787-unicodejsonrendererTom Christie
Adds UnicodeJSONRenderer
2013-05-18HEAD and OPTIONS should not be exposed as actions as discussed in ↵Nikolaus Schlemm
https://github.com/nschlemm/django-rest-framework/commit/a42afa04c38afe25c9032b8ce37b572678b02cf1#commitcomment-3241476
2013-05-18Drop another case of u'', this time from #530 codeMarkus Törnqvist
2013-05-18Drop u'', it was used inconsistently and breaks for nothing with Python 3.2Markus Törnqvist
2013-05-18Merge latest changes from master.Ryan Kaskel
2013-05-18Handle Python 3 strings and lazy strings.Ryan Kaskel
2013-05-18Fix order for applying min_value to fieldsStephan Groß